diff --git a/t/moderator.t b/t/moderator.t
index 3ecfdc1..723757f 100644
--- a/t/moderator.t
+++ b/t/moderator.t
@@ -87,13 +87,13 @@ subtest Login => sub {
     };
 
     subtest 'Buttons for mods', sub {
-        $t->get_ok('/thread/single/1')
+        $t->get_ok('/moderator/thread/single/1')
             ->status_is(200)
             ->element_exists('a[href*="/hide/1"]'  )
             ->element_exists('a[href*="/unhide/1"]')
             ->element_exists('a[href*="/unflag/1"]');
 
-        $t->get_ok('/remark/single/1')
+        $t->get_ok('/moderator/remark/single/1')
             ->status_is(200)
             ->element_exists('a[href*="/hide/1"]'  )
             ->element_exists('a[href*="/unhide/1"]')
diff --git a/templates/moderator/remark_by_id.html.ep b/templates/moderator/remark_by_id.html.ep
index a213941..253f9de 100644
--- a/templates/moderator/remark_by_id.html.ep
+++ b/templates/moderator/remark_by_id.html.ep
@@ -12,15 +12,6 @@
     <div class="post__body">
       <%== markdown $remark->{'body'} =%>
     </div>
-    <nav class="post__nav">
-      <%= link_to Thread => single_thread =>
-          {thread_id => $remark->{'thread_id'}}, (class => 'click') %>
-      <%= link_to Remark => post_remark =>
-          {thread_id => $remark->{'thread_id'}}, (class => 'click') %>
-      <%= link_to Flag => flag_remark => {remark_id => $remark->{'id'}},
-          (class => 'click') %>
-    </nav>
-    <% if (is_mod) { =%>
     <nav class="post__nav">
       <%= link_to Hide => hide_remark => {remark_id => $remark->{'id'}},
           (class => 'click') %>
@@ -29,7 +20,6 @@
       <%= link_to Unflag => unflag_remark => {remark_id => $remark->{'id'}},
           (class => 'click') %>
     </nav>
-    <% } =%>
   </article>
 </main>
 <% } =%>
diff --git a/templates/moderator/thread_by_id.html.ep b/templates/moderator/thread_by_id.html.ep
index 6ea7359..8d1f026 100644
--- a/templates/moderator/thread_by_id.html.ep
+++ b/templates/moderator/thread_by_id.html.ep
@@ -13,19 +13,6 @@
     <div class="post__body">
       <%== markdown $thread->{'body'} =%>
     </div>
-    <nav class="post__nav">
-      <%= link_to post_remark => {thread_id => $thread->{'id'}},
-          (class => 'click'), begin %>
-        Remark (<%= $thread->{'remark_tally'} %>)
-      <% end %>
-      <%= link_to bump_thread => {thread_id => $thread->{'id'}},
-          (class => 'click'), begin %>
-        Bump (<%= $thread->{'bump_tally'} %>)
-      <% end %>
-      <%= link_to Flag => flag_thread => {thread_id => $thread->{'id'}},
-          (class => 'click') %>
-    </nav>
-    <% if (is_mod) { =%>
     <nav class="post__nav">
       <%= link_to Hide => hide_thread => {thread_id => $thread->{'id'}},
           (class => 'click') %>
@@ -34,7 +21,6 @@
       <%= link_to Unflag => unflag_thread => {thread_id => $thread->{'id'}},
           (class => 'click') %>
     </nav>
-    <% } =%>
   </article>
 </main>
 <% } =%>
diff --git a/templates/remark/by_id.html.ep b/templates/remark/by_id.html.ep
index ffb671f..b49fc1a 100644
--- a/templates/remark/by_id.html.ep
+++ b/templates/remark/by_id.html.ep
@@ -36,16 +36,6 @@
       <%= link_to Flag => flag_remark => {remark_id => $remark->{'id'}},
           (class => 'click') %>
     </nav>
-    <% if (is_mod) { =%>
-    <nav class="post__nav">
-      <%= link_to Hide => hide_remark => {remark_id => $remark->{'id'}},
-          (class => 'click') %>
-      <%= link_to Unhide => unhide_remark => {remark_id => $remark->{'id'}},
-          (class => 'click') %>
-      <%= link_to Unflag => unflag_remark => {remark_id => $remark->{'id'}},
-          (class => 'click') %>
-    </nav>
-    <% } =%>
   </article>
 </main>
 <% } =%>
diff --git a/templates/remark/create.html.ep b/templates/remark/create.html.ep
index 0eb43ae..a16860d 100644
--- a/templates/remark/create.html.ep
+++ b/templates/remark/create.html.ep
@@ -82,16 +82,6 @@
       <%= link_to Flag => flag_remark => {remark_id => $last_remark->{'id'}},
           (class => 'click') %>
     </nav>
-    <% if (is_mod) { =%>
-    <nav class="post__nav">
-      <%= link_to Hide => hide_remark => {remark_id => $last_remark->{'id'}},
-      (class => 'click') %>
-      <%= link_to Unhide => unhide_remark => {remark_id =>
-          $last_remark->{'id'}}, (class => 'click') %>
-      <%= link_to Unflag => unflag_remark => {remark_id =>
-          $last_remark->{'id'}}, (class => 'click') %>
-    </nav>
-    <% } =%>
   </article>
 </section>
 <% } =%><%# Close the last_remark 'if' %>
@@ -122,16 +112,6 @@
       <%= link_to Flag => flag_thread => {thread_id => $thread->{'id'}},
           (class => 'click') %>
     </nav>
-    <% if (is_mod) { =%>
-    <nav class="post__nav">
-      <%= link_to Hide => hide_thread => {thread_id => $thread->{'id'}},
-          (class => 'click') %>
-      <%= link_to Unhide => unhide_thread => {thread_id => $thread->{'id'}},
-          (class => 'click') %>
-      <%= link_to Unflag => unflag_thread => {thread_id => $thread->{'id'}},
-          (class => 'click') %>
-    </nav>
-    <% } =%>
   </article>
 </section>
 <% } =%><%# Close the thread 'if' %>
diff --git a/templates/thread/by_id.html.ep b/templates/thread/by_id.html.ep
index 4040bb6..1f57ac0 100644
--- a/templates/thread/by_id.html.ep
+++ b/templates/thread/by_id.html.ep
@@ -38,16 +38,6 @@
       <%= link_to Flag => flag_thread => {thread_id => $thread->{'id'}},
           (class => 'click') %>
     </nav>
-    <% if (is_mod) { =%>
-    <nav class="post__nav">
-      <%= link_to Hide => hide_thread => {thread_id => $thread->{'id'}},
-          (class => 'click') %>
-      <%= link_to Unhide => unhide_thread => {thread_id => $thread->{'id'}},
-          (class => 'click') %>
-      <%= link_to Unflag => unflag_thread => {thread_id => $thread->{'id'}},
-          (class => 'click') %>
-    </nav>
-    <% } =%>
   </article>
 </main>
 <% } =%>