diff --git a/contrib/templates/default/board.mustache b/contrib/templates/default/board.mustache
index 5f750b3..120fb3f 100644
--- a/contrib/templates/default/board.mustache
+++ b/contrib/templates/default/board.mustache
@@ -68,12 +68,6 @@
         </div>
       {{/board.Threads}}
     </div>
-    <div class="pagelist">{{# board.PageList }}[<a href="{{LinkURL}}"> {{Text}} </a>]  {{/ board.PageList }}
-    <span class="navbar-sep">
-     |
-    </span>
-    <a href="{{board.Prefix}}catalog-{{board.Name}}.html"> {{#i18n.Translations}}{{catalog_label}}{{/i18n.Translations}} </a>
-    </div>
     <script type="text/javascript">
       var prefix = "{{board.Prefix}}";
       var e = document.getElementById("nntpchan_banner");
@@ -82,6 +76,12 @@
       ready(prefix);
     </script>
     <hr/>
+    <div class="pagelist">{{# board.PageList }}[<a href="{{LinkURL}}"> {{Text}} </a>]  {{/ board.PageList }}
+        <span class="navbar-sep">
+            |
+        </span>
+        <a href="{{board.Prefix}}catalog-{{board.Name}}.html"> {{#i18n.Translations}}{{catalog_label}}{{/i18n.Translations}} </a>
+    </div>
     <footer>
     <p class="legal">All posts on this site are the responsibility of the individual poster and not the administration, pursuant to 47 U.S.C. § 230.</p>
     <p class="legal">To make a DMCA request or report illegal content, please contact the administration</p>
diff --git a/contrib/templates/default/ukko.mustache b/contrib/templates/default/ukko.mustache
index 6667a5c..02deb75 100644
--- a/contrib/templates/default/ukko.mustache
+++ b/contrib/templates/default/ukko.mustache
@@ -41,7 +41,7 @@
       {{#threads}}
         <div class="thread" id="thread_{{OP.PostHash}}">
 	        <div class="truncated_post">
-            <div>{{#i18n.Translations}}{{posted_on_label}}{{/i18n.Translations}} <a href="{{{BoardURL}}}"><span class="ukko_boardname">{{OP.Board}}</span></a></div>  
+            <div>{{#i18n.Translations}}{{posted_on_label}}{{/i18n.Translations}} <a href="{{{BoardURL}}}"><span class="ukko_boardname">{{OP.Board}}</span></a></div>
             <div class="thread_header">
               <span class="thread_posts">
                 {{PostCount}} posts
@@ -64,21 +64,9 @@
           {{/Replies}}
         </div>
           {{/Truncate}}
-        <hr />  
+        <hr />
       {{/threads}}
       </div>
-      <div id="ukko_paginator">
-        {{#prev}}
-          <span id="ukko_prev">
-            <a href="{{prefix}}o/{{no}}/">previous</a>
-          </span>
-        {{/prev}}
-        {{#next}}
-          <span id="ukko_next">
-            <a href="{{prefix}}o/{{no}}/">next</a>
-          </span>
-        {{/next}}
-      </div>
       <script type="text/javascript" >
           var prefix = "{{prefix}}";
           var e = document.getElementById("nntpchan_banner");
@@ -86,7 +74,19 @@
           if(init) init(prefix);
           ready(prefix);
       </script>
-    <hr/>
+      <hr/>
+      <div id="ukko_paginator">
+          {{#prev}}
+              <span id="ukko_prev">
+                  <a href="{{prefix}}o/{{no}}/">previous</a>
+              </span>
+          {{/prev}}
+          {{#next}}
+              <span id="ukko_next">
+                  <a href="{{prefix}}o/{{no}}/">next</a>
+              </span>
+          {{/next}}
+      </div>
     <footer>
     <p class="legal">All posts on this site are the responsibility of the individual poster and not the administration, pursuant to 47 U.S.C. § 230.</p>
     <p class="legal">To make a DMCA request or report illegal content, please contact the administration</p>