diff --git a/templates/adminComments.cassius b/templates/adminComments.cassius
index 0436876..ffca76d 100644
--- a/templates/adminComments.cassius
+++ b/templates/adminComments.cassius
@@ -1,2 +1,17 @@
 .reply
   margin-left: 50px
+
+#mediabox
+  margin: 10px
+  padding: 5px
+  border: 1px solid #ddd
+  border-radius: 6px
+  box-shadow: 0 0 3px #c4c4c4
+
+#comment
+  margin-top: 5px
+  padding: 5px
+  border: 1px solid #ddd
+  border-radius: 6px
+  box-shadow: 0 0 3px #c4c4c4
+  background-color: #f5f5f5
diff --git a/templates/adminComments.hamlet b/templates/adminComments.hamlet
index c73b7e3..65a31af 100644
--- a/templates/adminComments.hamlet
+++ b/templates/adminComments.hamlet
@@ -5,12 +5,12 @@ $if null comments
   <p>There are no comments yet
 $else
   $forall (Entity mediumId medium) <- media
-    <pre>
+    <div #mediabox>
       <h4>#{mediumTitle medium}
       <hr>
       $forall (Entity commentId comment) <- comments
         $if commentOrigin comment == mediumId
-          <pre>
+          <div #comment>
             #{fromJust $ commentAuthorSlug comment} wrote on #{formatTime defaultTimeLocale "%A %F %H:%M" $ commentTime comment}:
             <hr>
             #{commentContent comment}
@@ -18,7 +18,7 @@ $else
         $forall (Entity replyId reply) <- replies
           $if commentParent reply == Just commentId
             $if commentOrigin reply == mediumId
-              <pre class="reply">
+              <div #comment class="reply">
                 #{fromJust $ commentAuthorSlug comment} wrote on #{formatTime defaultTimeLocale "%A %F %H:%M" $ commentTime comment}:
                 <hr>
                 #{commentContent reply}
diff --git a/templates/medium.cassius b/templates/medium.cassius
index 3bc3794..6d8aebd 100644
--- a/templates/medium.cassius
+++ b/templates/medium.cassius
@@ -3,3 +3,11 @@ img
 
 .reply
   margin-left: 50px
+
+#comment
+  margin-top: 5px
+  padding: 5px
+  border: 1px solid #ddd
+  border-radius: 6px
+  box-shadow: 0 0 3px #c4c4c4
+  background-color: #f5f5f5
diff --git a/templates/medium.hamlet b/templates/medium.hamlet
index a2c94f7..3a9a931 100644
--- a/templates/medium.hamlet
+++ b/templates/medium.hamlet
@@ -29,7 +29,7 @@ $if null comments
   <p>There are no Comments yet
 $else
   $forall (Entity commentId comment) <- comments
-    <pre>
+    <div #comment>
       <a href=@{ProfileR $ fromJust $ commentAuthor comment}>#{fromJust $ commentAuthorSlug comment}</a> wrote on #{formatTime defaultTimeLocale "%A %F %H:%M" $ commentTime comment}:
       <hr>
       #{commentContent comment}
@@ -40,7 +40,7 @@ $else
           <a href=@{CommentDeleteR commentId}>Delete this comment
     $forall (Entity replyId reply) <- replies
       $if commentParent reply == Just commentId
-        <pre class="reply">
+        <div #comment class="reply">
           <a href=@{ProfileR $ fromJust $ commentAuthor reply}>#{fromJust $ commentAuthorSlug reply}</a> wrote on #{formatTime defaultTimeLocale "%A %F %H:%M" $ commentTime reply}:
           <hr>
           #{commentContent reply}