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 a8a7206ab..0b4162ba8 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
@@ -42,10 +42,12 @@ using (Html.BeginForm("Create", "Comment", new { area = "Orchard.Comments" }, Fo
         @Html.Hidden("Name", WorkContext.CurrentUser.UserName ?? "")
         @Html.Hidden("Email", WorkContext.CurrentUser.Email ?? "")
     }
+
+    <h2 id="commenter">@if (Request.IsAuthenticated) { @T("Hi, {0}!", Html.Encode(WorkContext.CurrentUser.UserName))}</h2>
     <fieldset class="what">
     <ol>
         <li>
-            <label for="CommentText">@if (Request.IsAuthenticated) { @T("Hi, {0}!", Html.Encode(WorkContext.CurrentUser.UserName))<br /> } @T("Comment")</label>
+            <label for="CommentText">@T("Comment")</label>
             <textarea id="CommentText" rows="10" cols="30" name="CommentText"></textarea>
         </li>
         <li>
diff --git a/src/Orchard.Web/Modules/Orchard.Users/Views/Account/LogOn.cshtml b/src/Orchard.Web/Modules/Orchard.Users/Views/Account/LogOn.cshtml
index 80f10f300..0c5f3a985 100644
--- a/src/Orchard.Web/Modules/Orchard.Users/Views/Account/LogOn.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Users/Views/Account/LogOn.cshtml
@@ -5,21 +5,23 @@
 @Html.ValidationSummary(T("Login was unsuccessful. Please correct the errors and try again.").ToString())
 
 @using (Html.BeginFormAntiForgeryPost(Url.Action("LogOn", new {ReturnUrl = Request.QueryString["ReturnUrl"]}))) {
-<fieldset class="login-form">
+<fieldset class="login-form group">
     <legend>@T("Account Information")</legend>
-    <div class="group">
+    <ol>
+    <li>
         <label for="userNameOrEmail">@T("Username:")</label>
         @Html.TextBox("userNameOrEmail", "", new { autofocus = "autofocus" })
         @Html.ValidationMessage("userNameOrEmail")
-    </div>
-    <div class="group">
+    </li>
+    <li>
         <label for="password">@T("Password:")</label>
         @Html.Password("password")
         @Html.ValidationMessage("password")
-    </div>
-    <div class="group">
+    </li>
+    <li>
         @Html.CheckBox("rememberMe")<label class="forcheckbox" for="rememberMe">@T("Remember me?")</label>
-    </div>
+    </li>
     <input type="submit" value="@T("Log On")" />
+    </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 3ecadbd85..bd44928bd 100644
--- a/src/Orchard.Web/Themes/TheThemeMachine/Styles/Site.css
+++ b/src/Orchard.Web/Themes/TheThemeMachine/Styles/Site.css
@@ -401,12 +401,16 @@ button:focus, .button:focus {
 
 
 /* For testing purposes */
-#comments {
+#comments, #commenter {
     font-size:1.6em;
     font-weight:600;
     margin:1.2em 0 1.8em 1.2em;
 }
 
+#commenter {
+    margin:1.2em 0 0 1em;
+}
+
 ul.comments, form.comment {
     margin:1.2em 0 1.2em 1.8em;
     list-style: none;