diff --git a/templates/layouts/main.gohtml b/templates/layouts/main.gohtml
index 6b06e88..dfe4f24 100644
--- a/templates/layouts/main.gohtml
+++ b/templates/layouts/main.gohtml
@@ -9,17 +9,17 @@
         <nav class="navbar is-dark">
             <div class="container">
                 <div class="navbar-brand">
-                    <a href="{{call .Reverse "home"}}" class="navbar-item">{{.AppName}}</a>
+                    <a href="{{call .ToURL "home"}}" class="navbar-item">{{.AppName}}</a>
                 </div>
                 <div id="navbarMenu" class="navbar-menu">
                     <div class="navbar-end">
-                        {{link (call .Reverse "home") "Home" .Path "navbar-item"}}
-                        {{link (call .Reverse "about") "About" .Path "navbar-item"}}
-                        {{link (call .Reverse "contact") "Contact" .Path "navbar-item"}}
+                        {{link (call .ToURL "home") "Home" .Path "navbar-item"}}
+                        {{link (call .ToURL "about") "About" .Path "navbar-item"}}
+                        {{link (call .ToURL "contact") "Contact" .Path "navbar-item"}}
                         {{- if .IsAuth}}
-                            {{link (call .Reverse "logout") "Logout" .Path "navbar-item"}}
+                            {{link (call .ToURL "logout") "Logout" .Path "navbar-item"}}
                         {{- else}}
-                            {{link (call .Reverse "login") "Login" .Path "navbar-item"}}
+                            {{link (call .ToURL "login") "Login" .Path "navbar-item"}}
                         {{- end}}
                     </div>
                 </div>
diff --git a/templates/pages/error.gohtml b/templates/pages/error.gohtml
index 2a323ff..17ac1d5 100644
--- a/templates/pages/error.gohtml
+++ b/templates/pages/error.gohtml
@@ -4,7 +4,7 @@
     {{else if  or (eq .StatusCode 403) (eq .StatusCode 401)}}
         <p>You are not authorized to view the requested page.</p>
     {{else if eq .StatusCode 404}}
-        <p>Click {{link (call .Reverse "home") "here" .Path}} to return home</p>
+        <p>Click {{link (call .ToURL "home") "here" .Path}} to return home</p>
     {{else}}
         <p>Something went wrong</p>
     {{end}}
diff --git a/templates/pages/forgot-password.gohtml b/templates/pages/forgot-password.gohtml
index e838e83..18437d0 100644
--- a/templates/pages/forgot-password.gohtml
+++ b/templates/pages/forgot-password.gohtml
@@ -14,7 +14,7 @@
                 <button class="button is-primary">Reset password</button>
             </p>
             <p class="control">
-                <a href="{{call .Reverse "home"}}" class="button is-light">Cancel</a>
+                <a href="{{call .ToURL "home"}}" class="button is-light">Cancel</a>
             </p>
         </div>
         {{template "csrf" .}}
diff --git a/templates/pages/login.gohtml b/templates/pages/login.gohtml
index d82ebf4..af18c6c 100644
--- a/templates/pages/login.gohtml
+++ b/templates/pages/login.gohtml
@@ -17,10 +17,10 @@
                 <button class="button is-primary">Log in</button>
             </p>
             <p class="control">
-                <a href="{{call .Reverse "home"}}" class="button is-light">Cancel</a>
+                <a href="{{call .ToURL "home"}}" class="button is-light">Cancel</a>
             </p>
         </div>
         {{template "csrf" .}}
     </form>
-    <div class="content is-small"><a href="{{call .Reverse "register"}}">Create an account</a> - <a href="{{call .Reverse "forgot_password"}}">Forgot password?</a></div>
+    <div class="content is-small"><a href="{{call .ToURL "register"}}">Create an account</a> - <a href="{{call .ToURL "forgot_password"}}">Forgot password?</a></div>
 {{end}}
\ No newline at end of file
diff --git a/templates/pages/register.gohtml b/templates/pages/register.gohtml
index c69dd3b..fd65497 100644
--- a/templates/pages/register.gohtml
+++ b/templates/pages/register.gohtml
@@ -29,7 +29,7 @@
                 <button class="button is-primary">Register</button>
             </p>
             <p class="control">
-                <a href="{{call .Reverse "home"}}" class="button is-light">Cancel</a>
+                <a href="{{call .ToURL "home"}}" class="button is-light">Cancel</a>
             </p>
         </div>
         {{template "csrf" .}}