diff --git a/app/githop.go b/app/githop.go
index 62593fb..ab8c612 100644
--- a/app/githop.go
+++ b/app/githop.go
@@ -69,6 +69,15 @@ func initGithubOAuthConfig() {
 }
 
 func initTemplates() {
+	funcMap := template.FuncMap{
+		"routeUrl": func(name string) (string, error) {
+			url, err := router.Get(name).URL()
+			if err != nil {
+				return "", err
+			}
+			return url.String(), nil
+		},
+	}
 	sharedFileNames, err := filepath.Glob("templates/shared/*.html")
 	if err != nil {
 		log.Panicf("Could not read shared template file names %s", err.Error())
@@ -89,7 +98,8 @@ func initTemplates() {
 		}
 		fileNames = append(fileNames, templateFileName)
 		fileNames = append(fileNames, sharedFileNames...)
-		templates[templateName], err = template.ParseFiles(fileNames...)
+		_, templateFileName = filepath.Split(fileNames[0])
+		templates[templateName], err = template.New(templateFileName).Funcs(funcMap).ParseFiles(fileNames...)
 		if err != nil {
 			log.Panicf("Could not parse template files for %s: %s", templateFileName, err.Error())
 		}
@@ -112,11 +122,7 @@ func indexHandler(w http.ResponseWriter, r *http.Request) {
 	session, _ := sessionStore.Get(r, sessionConfig.CookieName)
 	userId, ok := session.Values[sessionConfig.UserIdKey].(int)
 	if !ok {
-		signInUrl, _ := router.Get("sign-in").URL()
-		var data = map[string]string{
-			"SignInUrl": signInUrl.String(),
-		}
-		if err := templates["index-signed-out"].Execute(w, data); err != nil {
+		if err := templates["index-signed-out"].Execute(w, nil); err != nil {
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 		}
 		return
@@ -134,15 +140,7 @@ func indexHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	signOutUrl, _ := router.Get("sign-out").URL()
-	viewDigestUrl, _ := router.Get("view-digest").URL()
-	sendDigestUrl, _ := router.Get("send-digest").URL()
-	var data = map[string]interface{}{
-		"SignOutUrl":    signOutUrl.String(),
-		"ViewDigestUrl": viewDigestUrl.String(),
-		"SendDigestUrl": sendDigestUrl.String(),
-	}
-	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)
 	}
 }
diff --git a/app/templates/index-signed-out.html b/app/templates/index-signed-out.html
index 5103eec..ff675c6 100644
--- a/app/templates/index-signed-out.html
+++ b/app/templates/index-signed-out.html
@@ -2,7 +2,7 @@
 
 {{define "body"}}
 
-<a href="{{.SignInUrl}}">
+<a href="{{routeUrl "sign-in"}}">
   Sign In
 </a>
 
diff --git a/app/templates/index.html b/app/templates/index.html
index cf80f4e..9b3e57d 100644
--- a/app/templates/index.html
+++ b/app/templates/index.html
@@ -3,14 +3,14 @@
 {{define "body"}}
 
 <p>
-  <a href="{{.SignOutUrl}}">
+  <a href="{{routeUrl "sign-out"}}">
     Sign Out
   </a>
 </p>
 
-<a href="{{.ViewDigestUrl}}">View Digest</a>
+<a href="{{routeUrl "view-digest"}}">View Digest</a>
 -
-<form id="send-form" method="POST" action="{{.SendDigestUrl}}">
+<form id="send-form" method="POST" action="{{routeUrl "send-digest"}}">
   <input type="submit" value="Email Digest">
 </form>