diff --git a/app/githop.go b/app/githop.go
index dc1d23c..cb49b85 100644
--- a/app/githop.go
+++ b/app/githop.go
@@ -48,6 +48,7 @@ func init() {
 	router.HandleFunc("/digest/send", sendDigestHandler).Name("send-digest").Methods("POST")
 	router.HandleFunc("/digest/cron", digestCronHandler)
 
+	router.HandleFunc("/account/settings", settingsHandler).Name("settings")
 	router.HandleFunc("/account/set-timezone", setTimezoneHandler).Name("set-timezone").Methods("POST")
 
 	router.HandleFunc("/admin/digest", digestAdminHandler)
@@ -184,11 +185,7 @@ func indexHandler(w http.ResponseWriter, r *http.Request) {
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 		return
 	}
-	var data = map[string]interface{}{
-		"Account":   account,
-		"Timezones": timezones,
-	}
-	if err := templates["index"].Execute(w, data); err != nil {
+	if err := templates["index"].Execute(w, nil); err != nil {
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 	}
 }
@@ -339,6 +336,26 @@ func githubOAuthCallbackHandler(w http.ResponseWriter, r *http.Request) {
 	http.Redirect(w, r, indexUrl.String(), http.StatusFound)
 }
 
+func settingsHandler(w http.ResponseWriter, r *http.Request) {
+	session, _ := sessionStore.Get(r, sessionConfig.CookieName)
+	userId := session.Values[sessionConfig.UserIdKey].(int)
+	c := appengine.NewContext(r)
+	account, err := getAccount(c, userId)
+	if err != nil {
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+		return
+	}
+
+	var data = map[string]interface{}{
+		"Account":   account,
+		"Timezones": timezones,
+	}
+	if err := templates["settings"].Execute(w, data); err != nil {
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+	}
+}
+
+
 func setTimezoneHandler(w http.ResponseWriter, r *http.Request) {
 	session, _ := sessionStore.Get(r, sessionConfig.CookieName)
 	userId := session.Values[sessionConfig.UserIdKey].(int)
diff --git a/app/templates/index.html b/app/templates/index.html
index c98a87c..5ecbba0 100644
--- a/app/templates/index.html
+++ b/app/templates/index.html
@@ -13,22 +13,7 @@
 <form id="send-form" method="POST" action="{{routeUrl "send-digest"}}">
   <input type="submit" value="Email Digest">
 </form>
-
-<p>
-  <form method="POST" action="{{routeUrl "set-timezone"}}">
-    <select name="timezone_name">
-        {{$accountTimezoneName := .Account.TimezoneName}}
-        {{range .Timezones}}
-          {{if .LocationName}}
-            <option value={{.LocationName}} {{if eq .LocationName $accountTimezoneName}}selected{{end}}>{{.LocationName}} (GMT {{.DisplayUTCOffset}})</option>
-          {{else}}
-            <option disabled></option>
-          {{end}}
-        {{end}}
-    </select>
-
-    <input type="submit" value="Set Timezone">
-  </form>
-</p>
+-
+<a href="{{routeUrl "settings"}}">Settings</a>
 
 {{end}}
diff --git a/app/templates/settings.html b/app/templates/settings.html
new file mode 100644
index 0000000..c5b0642
--- /dev/null
+++ b/app/templates/settings.html
@@ -0,0 +1,23 @@
+{{define "title"}}GitHop - Settings{{end}}
+
+{{define "body"}}
+
+<p>
+  <form method="POST" action="{{routeUrl "set-timezone"}}">
+    <select name="timezone_name">
+        {{$accountTimezoneName := .Account.TimezoneName}}
+        {{range .Timezones}}
+          {{if .LocationName}}
+            <option value={{.LocationName}} {{if eq .LocationName $accountTimezoneName}}selected{{end}}>{{.LocationName}} (GMT {{.DisplayUTCOffset}})</option>
+          {{else}}
+            <option disabled></option>
+          {{end}}
+        {{end}}
+    </select>
+
+    <input type="submit" value="Set Timezone">
+  </form>
+</p>
+
+{{end}}
+