diff --git a/Handler/Entry.hs b/Handler/Entry.hs
index a1ae883..7839d52 100644
--- a/Handler/Entry.hs
+++ b/Handler/Entry.hs
@@ -60,7 +60,7 @@ neahForComment _ = "X" :: Text
 
 -- showCommentTree :: Tree (Entity Comment) -> Hamlet
 showCommentTree tree creators = 
-  [hamlet|<li>
+  [hamlet|<li #Comment#{showId commentId}>
             <div .meta> 
               <div .vote>
                 <div .yeah>#{yeahForComment commentId}
diff --git a/templates/entry.hamlet b/templates/entry.hamlet
index 0e75b63..09d0720 100644
--- a/templates/entry.hamlet
+++ b/templates/entry.hamlet
@@ -14,18 +14,10 @@
           $else
           <a class="delete" href=@{EntryR entryId} id="Deltr#{showId entryId}">delete</a>
 
-<h3> Comments
-
-$if null comments
-    <p> Be the first to comment
-$else
-    <div #comments>
-        ^{showCommentForest commentForest creators}
-
 <hr>
 $if isNothing currentUserId
     <div #login>
-        <a href=@{AuthR LoginR}> Log in
+        <a href=@{AuthR LoginR}> Log in to comment
     <div #loginmessage>
         <div .insidebox>
             <a href=@{AuthR LoginR}> Log in
@@ -39,3 +31,12 @@ $else
     <hr>
     <div #logout>
         <a href=@{AuthR LogoutR}>Log out
+
+<h3> Comments
+
+$if null comments
+    <p> Be the first to comment
+$else
+    <div #comments>
+        ^{showCommentForest commentForest creators}
+
diff --git a/templates/ycss.lucius b/templates/ycss.lucius
index 82ffbf8..1d8821d 100644
--- a/templates/ycss.lucius
+++ b/templates/ycss.lucius
@@ -177,7 +177,7 @@ form input[type="submit"]:active {
          border-radius: 2px; }
     .meta { font-size: .7em; height: 1.7em;}
     .actions { font-size: .7em; }
-    .content { min-height: 1.5em; }
+    .content { min-height: 1.5em; color: #{base01} }
     .actions > span:hover {
         color: #{orange};
         text-shadow: 0 0 1px #{shadoworange};