diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Views/ListOfComments.cshtml b/src/Orchard.Web/Modules/Orchard.Comments/Views/ListOfComments.cshtml
index 9de2d99ae..d1c566b6e 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Views/ListOfComments.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Views/ListOfComments.cshtml
@@ -2,15 +2,20 @@
 @using Orchard.Comments.Models;
 
 <ul class="comments">
-@foreach (var comment in Model) { 
-    <li>
-        <div class="comment">
-            <span class="who">@Html.LinkOrDefault(comment.Record.UserName, comment.Record.SiteName, new { rel = "nofollow" })</span>
-            <span>said @Html.Link(Html.DateTimeRelative(comment.Record.CommentDateUtc.GetValueOrDefault(), T).ToString(), "#")</span>
-        </div>
-        <div class="text">
-            <p>@comment.Record.CommentText</p>
-        </div>
-    </li>
+@foreach (var comment in Model) {
+	<li>
+		<article class="comment">
+			<header>
+				<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>
+				</h4>
+			</header>
+			<p class="text">@comment.Record.CommentText</p>
+		</article>
+	</li>
 } 
-</ul>
\ No newline at end of file
+</ul>
+
diff --git a/src/Orchard.Web/Themes/TheThemeMachine/Styles/Site.css b/src/Orchard.Web/Themes/TheThemeMachine/Styles/Site.css
index 2fb7161ea..7205f7c6c 100644
--- a/src/Orchard.Web/Themes/TheThemeMachine/Styles/Site.css
+++ b/src/Orchard.Web/Themes/TheThemeMachine/Styles/Site.css
@@ -408,27 +408,26 @@ button:focus, .button:focus {
 
 ul.comments, form.comment {
     margin:1.2em 0 1.2em 1.8em;
+    list-style: none;
 }
 
-div.comment {
-    font-size:1.3em;
-    font-style:italic;
-    color:#484848;
+article.comment h4 {
+    font-size:1.4em;
 }
 
-div.comment a {
+article.comment a {
     color:#484848;
     text-decoration:none;
 }
 
-div.comment span.who {
+article.comment span.who {
     font-weight:600;
     font-style:normal;
     text-transform:capitalize;
     color:#333;
 }
 
-ul.comments li div.text {
+article.comment p.text {
     margin:.6em 0 2.4em 0;
 }