diff --git a/PostText.pl b/PostText.pl
index 1cc6942..9b1fa12 100755
--- a/PostText.pl
+++ b/PostText.pl
@@ -121,7 +121,7 @@ group {
 
                 # Gotta be a better way to name this route...
                 return $c->redirect_to(
-                    'thread_idremark_page',
+                    'remark_page',
                     {thread_id => $thread_id}
                     );
             }
@@ -137,11 +137,10 @@ group {
 
 # Thread
 group {
-    under '/thread';
+    under '/thread/:thread_id', [thread_id => qr/[0-9]+/];
 
-    # This desperately needs clean-up
-    get '/:thread_id/:remark_page',
-        [thread_id => qr/[0-9]+/, remark_page => qr/[0-9]+/],
+    get '/:remark_page',
+        [remark_page => qr/[0-9]+/],
     {remark_page => 1}, sub ($c) {
         my $thread_id = $c->param('thread_id');
         my $thread    = $c->thread->get_thread_by_id($thread_id);
diff --git a/templates/thread_id.html.ep b/templates/thread_id.html.ep
index ab4f681..175afa0 100644
--- a/templates/thread_id.html.ep
+++ b/templates/thread_id.html.ep
@@ -13,21 +13,21 @@
   <%= link_to Remark => thread_id => {thread_id => $thread->{'id'}}  %>
 </nav>
 <% if (my $first_remark = @$remarks[0]) { =%>
-  <div class="remarks">
-    <h3>Remarks</h3>
-    <% for my $remark (@$remarks) { =%>
-      <article class="remark">
-        <span class="id">#<%= %$remark{'id'} %></span>
-        <h4 class="date"><%= %$remark{'date'} %></h4>
-        <h5 class="author"><%= %$remark{'author'} %></h5>
-        <p class="body"><%= %$remark{'body'} %></p>
-      </article>
-    <% } =%>
-  </div>
-  <nav>
-    <%= link_to Remark => thread_id => {thread_id => $thread->{'id'}}  %>
-    <% if ($last_page && $last_page != 1) { =%>
-    <%= pagination $this_page, $last_page, ($base_path . '/{page}') %>
-    <% } %>
-  </nav>
+<div class="remarks">
+  <h3>Remarks</h3>
+  <% for my $remark (@$remarks) { =%>
+  <article class="remark">
+    <span class="id">#<%= %$remark{'id'} %></span>
+    <h4 class="date"><%= %$remark{'date'} %></h4>
+    <h5 class="author"><%= %$remark{'author'} %></h5>
+    <p class="body"><%= %$remark{'body'} %></p>
+  </article>
+  <% } =%>
+</div>
+<nav>
+  <%= link_to Remark => thread_id => {thread_id => $thread->{'id'}}  %>
+  <% if ($last_page && $last_page != 1) { =%>
+  <%= pagination $this_page, $last_page, ($base_path . '/{page}') %>
+  <% } %>
+</nav>
 <% } =%>
diff --git a/templates/view_page.html.ep b/templates/view_page.html.ep
index 6bb0d87..440d5ce 100644
--- a/templates/view_page.html.ep
+++ b/templates/view_page.html.ep
@@ -5,8 +5,7 @@
   <% for my $thread (@$threads) { =%>
     <article class="thread">
       <span class="id">
-        <%= link_to "#$thread->{'id'}",
-          thread_idremark_page => {thread_id => $thread->{'id'}} %>
+        <%= link_to "#$thread->{'id'}", remark_page => {thread_id => $thread->{'id'}} %>
       </span>
       <h3 class="title"><%= %$thread{'title'} %></h3>
       <h4 class="date"><%= %$thread{'date'} %></h4>