diff --git a/viewer/static/css/styles.css b/viewer/static/css/styles.css
index d48d2ca..47131ed 100644
--- a/viewer/static/css/styles.css
+++ b/viewer/static/css/styles.css
@@ -36,10 +36,22 @@
     width: 100px;
 }
 
+.small-nav-icon {
+    width: 3em;
+}
+
 .mb-2 {
     margin-bottom: 2em;
 }
 
+.mr-2 {
+    margin-right: 2em;
+}
+
+.ml-2 {
+    margin-left: 2em;
+}
+
 /****************************************************************************
  * Grid.                                                                    *
  ****************************************************************************/
diff --git a/viewer/templates/gallery_view.html b/viewer/templates/gallery_view.html
index 67a6f76..16dfa7c 100644
--- a/viewer/templates/gallery_view.html
+++ b/viewer/templates/gallery_view.html
@@ -9,19 +9,34 @@
         <link href="{% static 'css/styles.css' %}" rel="stylesheet">
     </head>
     <body class="background">
-        {% include 'partials/navigation.html'%}
         {% if images|length > 0 %}
+        <table class="fc mauto">
+            <tr>
+                <td>
+                    <a href="/gallery/" class="mr-2">
+                        <img src="{% static 'imgs/gohome.png' %}" class="small-nav-icon">
+                    </a>
+                </td>
+                <td>
+                    <a href=".." class="mr-2">
+                        <img src="{% static 'imgs/back.png' %}" class="small-nav-icon">
+                    </a>
+                </td>
+                <td>
+                    <h1 class="mr-2">
+                        {{request.path}} - Files ({{num_files}})
+                    </h1>
+                </td>
+                {% if num_pages > 1 %}
+                <td>
+                    <div class="mauto">
+                        {% for page in pages %}<a href="./?page={{page}}">{{page}}</a>{% if not forloop.last %}<span> </span>{% endif %}{% endfor %}
+                    </div>
+                </td>
+                {% endif %}
+            </tr>
+        </table>
         <div class="centered-container">
-            <h1>
-                {{request.path}} - Files ({{num_files}})
-            </h1>
-        </div>
-        <div class="centered-container">
-            {% if num_pages > 1 %}
-            <div class="mb-2">
-                {% for page in pages %}<a href="./?page={{page}}">{{page}}</a>{% if not forloop.last %}<span> </span>{% endif %}{% endfor %}
-            </div>
-            {% endif %}
             <table class="fc mauto">
                 <tr>
                     {% if page != 1 %}
diff --git a/viewer/templates/image_view.html b/viewer/templates/image_view.html
index f691054..8f29469 100644
--- a/viewer/templates/image_view.html
+++ b/viewer/templates/image_view.html
@@ -9,7 +9,20 @@
         <link href="{% static 'css/styles.css' %}" rel="stylesheet">
     </head>
     <body class="background">
-        {% include 'partials/navigation.html'%}
+        <table class="fc mauto">
+            <tr>
+                <td>
+                    <a href="/gallery/">
+                        <img src="{% static 'imgs/gohome.png' %}" class="small-nav-icon">
+                    </a>
+                </td>
+                <td>
+                    <a href="..">
+                        <img src="{% static 'imgs/back.png' %}" class="small-nav-icon">
+                    </a>
+                </td>
+            </tr>
+        </table>
         <div class="centered-container">
             <div class="image-container">
                 <a href="{{image_path}}" target="_blank">
diff --git a/viewer/templates/partials/navigation.html b/viewer/templates/partials/navigation.html
deleted file mode 100644
index 7108e5a..0000000
--- a/viewer/templates/partials/navigation.html
+++ /dev/null
@@ -1,9 +0,0 @@
-{% load static %}
-<div class="centered-container">
-    <a href="/gallery/">
-        <img src="{% static 'imgs/gohome.png' %}" class="navigation-icon">
-    </a>
-    <a href="..">
-        <img src="{% static 'imgs/back.png' %}" class="navigation-icon">
-    </a>
-</div>
