diff --git a/config.yml b/config.yml
index e9523bb7..e0cfd9f3 100644
--- a/config.yml
+++ b/config.yml
@@ -9,7 +9,7 @@ wtf:
     refreshInterval: 300
     secretFile: "~/.wtf/gcal/client_secret.json"
   git:
-    commitCount: 10
+    commitCount: 5
     refreshInterval: 8
     repository: "/Users/chris/go/src/github.com/senorprogrammer/wtf"
   github:
diff --git a/weather/widget.go b/weather/widget.go
index aa09ab07..e5054855 100644
--- a/weather/widget.go
+++ b/weather/widget.go
@@ -54,6 +54,7 @@ func (widget *Widget) addView() {
 	view.SetBorderColor(tcell.ColorGray)
 	view.SetDynamicColors(true)
 	view.SetTitle(widget.Name)
+	view.SetWrap(false)
 
 	widget.View = view
 }
@@ -71,7 +72,7 @@ func (widget *Widget) contentFrom(data *owm.CurrentWeatherData) string {
 	tempUnit := Config.UString("wtf.weather.tempUnit", "C")
 
 	str = str + fmt.Sprintf("%8s: %4.1f° %s\n", "High", data.Main.TempMax, tempUnit)
-	str = str + fmt.Sprintf("%8s: [yellow]%4.1f° %s[white]\n", "Current", data.Main.Temp, tempUnit)
+	str = str + fmt.Sprintf("%8s: [green]%4.1f° %s[white]\n", "Current", data.Main.Temp, tempUnit)
 	str = str + fmt.Sprintf("%8s: %4.1f° %s\n", "Low", data.Main.TempMin, tempUnit)
 
 	str = str + "\n"
diff --git a/wtf.go b/wtf.go
index f55d3b84..a715c1d5 100644
--- a/wtf.go
+++ b/wtf.go
@@ -89,8 +89,8 @@ func main() {
 
 	grid.AddItem(bamboo.View, 0, 0, 2, 1, 0, 0, false)
 	grid.AddItem(cal.View, 2, 1, 4, 1, 0, 0, false)
-	grid.AddItem(git.View, 0, 2, 3, 3, 0, 0, false)
-	grid.AddItem(github.View, 3, 2, 2, 3, 0, 0, false)
+	grid.AddItem(git.View, 0, 2, 2, 3, 0, 0, false)
+	grid.AddItem(github.View, 2, 2, 2, 3, 0, 0, false)
 	grid.AddItem(weather.View, 0, 1, 1, 1, 0, 0, false)
 	grid.AddItem(sec.View, 5, 0, 1, 1, 0, 0, false)
 	grid.AddItem(opsgenie.View, 2, 0, 2, 1, 0, 0, false)