diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Views/ListOfComments.cshtml b/src/Orchard.Web/Modules/Orchard.Comments/Views/ListOfComments.cshtml
index d1c566b6e..17bff6a75 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Views/ListOfComments.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Views/ListOfComments.cshtml
@@ -9,7 +9,7 @@
 				<h4>
 					<span class="who">@Html.LinkOrDefault(comment.Record.UserName, comment.Record.SiteName, new { rel = "nofollow" })
 					</span>
-					<span>said <time datetime="@comment.Record.CommentDateUtc.GetValueOrDefault()">@Html.Link(Html.DateTimeRelative(comment.Record.CommentDateUtc.GetValueOrDefault(), T).ToString(), "#")</time>
+					<span class="when">said <time datetime="@comment.Record.CommentDateUtc.GetValueOrDefault()">@Html.Link(Html.DateTimeRelative(comment.Record.CommentDateUtc.GetValueOrDefault(), T).ToString(), "#")</time>
 					</span>
 				</h4>
 			</header>
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Views/Parts/Comments.Comments.cshtml b/src/Orchard.Web/Modules/Orchard.Comments/Views/Parts/Comments.Comments.cshtml
index 887980133..2be3bafbb 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Views/Parts/Comments.Comments.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Views/Parts/Comments.Comments.cshtml
@@ -19,37 +19,41 @@ else if(!Request.IsAuthenticated && !AuthorizedFor(Permissions.AddComment)) {
 } else {
 using (Html.BeginForm("Create", "Comment", new { area = "Orchard.Comments" }, FormMethod.Post, new { @class = "comment" })) { 
     @Html.ValidationSummary() 
-    <h2 id="addacomment">@T("Add a Comment")</h2>
-    if (!Request.IsAuthenticated) { 
+    if (!Request.IsAuthenticated) {
+    <h2 id="addacomment">@T("Add a Comment")</h2> 
     <fieldset class="who">
-        <div>
+    <ol>
+        <li>
             <label for="Name">@T("Name")</label>
             <input id="Name" class="text" name="Name" type="text" />
-        </div>
-        <div>
+        </li>
+        <li>
             <label for="Email">@T("Email")</label>
             <input id="Email" class="text" name="Email" type="text" />
-        </div>
-        <div>
+        </li>
+        <li>
             <label for="SiteName">@T("Url")</label>
             <input id="SiteName" class="text" name="SiteName" type="text" />
-        </div>
+        </li>
+     </ol>
     </fieldset>
     } else {
         @Html.Hidden("Name", WorkContext.CurrentUser.UserName ?? "")
         @Html.Hidden("Email", WorkContext.CurrentUser.Email ?? "")
     }
     <fieldset class="what">
-        <div>
+    <ol>
+        <li>
             <label for="CommentText">@if (Request.IsAuthenticated) { @T("Hi, {0}!", Html.Encode(WorkContext.CurrentUser.UserName))<br /> } @T("Comment")</label>
             <textarea id="CommentText" rows="10" cols="30" name="CommentText"></textarea>
-        </div>
-        <div>
+        </li>
+        <li>
             <input type="submit" class="button" value="@T("Submit Comment")" />
             @Html.Hidden("CommentedOn", (int)Model.ContentPart.ContentItem.Id) 
             @Html.Hidden("ReturnUrl", Context.Request.ToUrlString()) 
             @Html.AntiForgeryTokenOrchard() 
-        </div>
+        </li>
+    </ol>
     </fieldset>
     }
-} 
\ No newline at end of file
+} 
diff --git a/src/Orchard.Web/Themes/TheThemeMachine/Styles/Site.css b/src/Orchard.Web/Themes/TheThemeMachine/Styles/Site.css
index 7205f7c6c..ea846c1ee 100644
--- a/src/Orchard.Web/Themes/TheThemeMachine/Styles/Site.css
+++ b/src/Orchard.Web/Themes/TheThemeMachine/Styles/Site.css
@@ -303,7 +303,6 @@ label.forcheckbox { margin:0 0 0 .4em; display:inline; }
 fieldset          { padding:0em; margin: 0 0 0em 0; border: 0px solid #dbdbdb; }
 legend            { font-weight: 600; font-size:1.2em; }
 
-
 input[type="text"], #CommentText, #password, #confirmPassword {
     border:1px solid #999;
     display: block;
@@ -320,11 +319,14 @@ form.search {
     width:17em;
 }
 
-fieldset div {margin:1.6em 0 0 0}
+fieldset ol {list-style-type:none;}
+
+fieldset ol li {margin:1.6em 0 0 0}
     
 legend {
 	font-size: 1.4em;
 	border:none;
+	border:1px solid #ff0000;
 }
 
 label {