diff --git a/public_html/templates/top-navigation.tpl b/public_html/templates/top-navigation.tpl
index 26652ec0..57bbad2c 100644
--- a/public_html/templates/top-navigation.tpl
+++ b/public_html/templates/top-navigation.tpl
@@ -1,51 +1,33 @@
 <ul>
-	<li class="home">
-		<a href="#/home">Home</a>
-	</li>
+	<%
+		var links = [['home', '#/home', 'Home']];
+		if (canListPosts) {
+			links.push(['posts', '#/posts', 'Posts']);
+			if (canUploadPosts) {
+				links.push(['upload', '#/upload', 'Upload']);
+			}
+			links.push(['comments', '#/comments', 'Comments']);
+		}
+		if (canListTags) {
+			links.push(['tags', '#/tags', 'Tags']);
+		}
+		if (canListUsers) {
+			links.push(['users', '#/users', 'Users']);
+		}
+		if (!loggedIn) {
+			links.push(['login', '#/login', 'Login']);
+			links.push(['register', '#/register', 'Register']);
+		} else {
+			links.push(['my-account', '#/user/' + user.name, user.name]);
+			links.push(['logout', '#/logout', 'Logout']);
+		}
+		links.push(['help', '#/help', 'Help']);
+	%>
 
-	<% if (canListPosts) { %>
-		<li class="posts">
-			<a href="#/posts">Posts</a>
-		</li>
-		<% if (canUploadPosts) { %>
-			<li class="upload">
-				<a href="#/upload">Upload</a>
-			</li>
-		<% } %>
-		<li class="comments">
-			<a href="#/comments">Comments</a>
-		</li>
-	<% } %>
-
-	<% if (canListTags) { %>
-		<li class="tags">
-			<a href="#/tags">Tags</a>
-		</li>
-	<% } %>
-
-	<% if (canListUsers) { %>
-		<li class="users">
-			<a href="#/users">Users</a>
-		</li>
-	<% } %>
-
-	<% if (!loggedIn) { %>
-		<li class="login">
-			<a href="#/login">Login</a>
-		</li>
-		<li class="register">
-			<a href="#/register">Register</a>
-		</li>
-	<% } else { %>
-		<li class="my-account">
-			<a href="#/user/<%= user.name %>"><%= user.name %></a>
-		</li>
-		<li class="logout">
-			<a href="#/logout">Logout</a>
-		</li>
-	<% } %>
-
-	<li class="help">
-		<a href="#/help">Help</a>
-	</li>
+	<% _.each(links, function(link) { %><!--
+		--><% var className = link[0], target=link[1], title=link[2] %><!--
+		--><li class="<%= className %>">
+			<a href="<%= target %>"><%= title %></a>
+		</li><!--
+	--><% }) %>
 </ul>