diff --git a/assets/sass/style.sass b/assets/sass/style.sass
index a366e070d3ad4a5ec8456037a4253531a3cf1338..d7c900e0f1ade9b3b4a25b0abd862e1b38fe414b 100644
--- a/assets/sass/style.sass
+++ b/assets/sass/style.sass
@@ -7,7 +7,12 @@ body
   font-family: 'Lato', sans-serif
   font-size: 81.25%
 
-.images 
+nav
+  display: flex
+  .spacer
+    flex-grow: 1
+
+.images
   display: flex
   max-width: 1024px
   margin: 0 auto
diff --git a/templates/_navigation.html b/templates/_navigation.html
index 98537cbd26af0cb798905727e557959c1cf707c2..3d85eb02a672485e57dd1e3a97c464a50faacf70 100644
--- a/templates/_navigation.html
+++ b/templates/_navigation.html
@@ -3,10 +3,13 @@
     <ul>
         <li class="title">ik8r</li>
     {{if .Id}}
-        <li class="upload"><a href="/upload">Upload</a></li>
-        <li class="images"><a href="/me/images">My Images</a></li>
-        <li class="albums"><a href="/me/albums">My Albums</a></li>
-        <li class="me"><a href="/me/">{{.Name}}</a></li>
+        <li><a href="/upload">Upload</a></li>
+    {{end}}
+        <li class="spacer"></li>
+    {{if .Id}}
+        <li><a href="/me/images">My Images</a></li>
+        <li><a href="/me/albums">My Albums</a></li>
+        <li><a href="/me/">{{.Name}}</a></li>
     {{end}}
     </ul>
 </nav>