diff --git a/assets/css/PostText.css b/assets/css/PostText.css
index 768e13b..da260d7 100644
--- a/assets/css/PostText.css
+++ b/assets/css/PostText.css
@@ -45,7 +45,7 @@ header > nav a {
   background-color: #8C97A8;
 }
 
-.threads {
+.threads, .remarks {
   display: flex;
   flex-direction: column;
   /* border: dashed; */
@@ -53,12 +53,12 @@ header > nav a {
   padding: 0.5em 0;
 }
 
-.thread {
+.thread, .remark {
   background-color: #C2B3A9;
   border: outset;
 }
 
-.thread .title {
+.thread .title, .remark .date {
   display: flex;
   justify-content: space-between;
   flex-wrap: wrap;
@@ -69,7 +69,7 @@ header > nav a {
   border: inset;
 }
 
-.thread .title .id {
+.thread .title .id, .remark .id {
   border: outset;
   padding: 0.25em;
   background-color: #999999;
@@ -80,12 +80,17 @@ header > nav a {
   padding: 0.25em 0.5em;
 }
 
-.thread .body {
+.remark .date, .remark .author, .remark .body {
+  margin: 1em 0.5em;
+  padding: 0.25em 0.5em;
+}
+
+.thread .body, .remark .body {
     background-color: #A59990;
     border: inset;
 }
 
-.thread nav {
+.thread nav, .remark nav {
   display: flex;
   justify-content: flex-end;
   flex-flow: row wrap;
@@ -94,7 +99,7 @@ header > nav a {
   align-items: center;
 }
 
-.thread nav a {
+.thread nav a, .remark nav a {
   flex: 1 0;
   text-align: center;
   border: outset;
diff --git a/templates/thread/by_id.html.ep b/templates/thread/by_id.html.ep
index 1b2ffb7..815e7bc 100644
--- a/templates/thread/by_id.html.ep
+++ b/templates/thread/by_id.html.ep
@@ -11,14 +11,12 @@
     </div>
     <nav>
       <%= link_to post_remark => {thread_id => $thread->{'id'}}, begin %>
-        Remark (<%= $thread->{'remark_tally'} %> remarks)
+        Remark (<%= $thread->{'remark_tally'} %>)
       <% end %>
       <%= link_to bump_thread => {thread_id => $thread->{'id'}}, begin %>
-        Bump (<%= $thread->{'bump_tally'} %> bumps)
+        Bump (<%= $thread->{'bump_tally'} %>)
       <% end %>
-      <span class="flag">
-        <%= link_to Flag => flag_thread => {thread_id => $thread->{'id'}} %>
-      </span>
+      <%= link_to Flag => flag_thread => {thread_id => $thread->{'id'}} %>
     </nav>
     <% if (is_mod) { =%>
     <nav>
@@ -36,10 +34,8 @@
   <article class="remark">
     <h4 class="date">
       <%= $remark->{'date'} %>
-      <span class="id">
-        <%= link_to "#$remark->{'id'}",
-            single_remark => {remark_id => $remark->{'id'}} %>
-      </span>
+      <%= link_to "#$remark->{'id'}",
+          single_remark => {remark_id => $remark->{'id'}}, (class => 'id') %>
     </h4>
     <h5 class="author"><%= $remark->{'author'} %></h5>
     <div class="body">
@@ -47,9 +43,7 @@
     </div>
     <nav>
       <%= link_to Remark => post_remark => {thread_id => $thread->{'id'}} %>
-      <span class="flag">
-        <%= link_to Flag => flag_remark => {remark_id => $remark->{'id'}} %>
-      </span>
+      <%= link_to Flag   => flag_remark => {remark_id => $remark->{'id'}} %>
     </nav>
   </article>
   <% } =%>