diff --git a/index.py b/index.py
index 4f1445c..79be4b9 100755
--- a/index.py
+++ b/index.py
@@ -53,13 +53,13 @@ def isLoggedin():
 def buildNav():
 	nav = []
 	if isLoggedin():
-		nav.append('edit')
+		nav.append(('Edit own Account', 'edit'))
 		if isAdmin():
-			nav.append('list')
-			nav.append('create')
-		nav.append('logout')
+			nav.append(('List Accounts', 'list_users'))
+			nav.append(('Create Account', 'create'))
+		nav.append(('Logout', 'logout'))
 	else:
-		nav.append('login')
+		nav.append(('Login', 'login'))
 	return nav
 
 
diff --git a/templates/_base.html b/templates/_base.html
index 25746c0..8cdb793 100644
--- a/templates/_base.html
+++ b/templates/_base.html
@@ -19,9 +19,9 @@
       </a>
       <hr/>
       <ul class="nav nav-pills nav-stacked">
-        {% for ni in nav %}
-        <li{%- if request.path == url_for(ni) %} class="active"{% endif %}>
-          <a href="{{ url_for(ni) }}">{{ ni|capitalize }}</a>
+        {% for ni, func in nav %}
+        <li{%- if request.path == url_for(func) %} class="active"{% endif %}>
+          <a href="{{ url_for(func) }}">{{ ni }}</a>
         </li>
         {% endfor %}
       </ul>