diff --git a/isso/css/isso.scss b/isso/css/isso.scss
index d25c2a8..89c2470 100644
--- a/isso/css/isso.scss
+++ b/isso/css/isso.scss
@@ -60,11 +60,11 @@ a {
   > div.text-wrapper {
     @include span-columns(10 of 11);
 
-    > header, > footer {
+    > .isso-comment-header, > .isso-comment-footer {
       font-size: 0.95em;
     }
 
-    > header {
+    > .isso-comment-header {
       font-family: "Helvetica", Arial, sans-serif;
       font-size: 0.85em;
 
@@ -109,7 +109,7 @@ a {
       font: inherit;
     }
 
-    > footer {
+    > .isso-comment-footer {
 
       font-family: "Helvetica", Arial, sans-serif;
       font-size: 0.80em;
diff --git a/isso/js/app/isso.js b/isso/js/app/isso.js
index b3170e2..67d4ebb 100644
--- a/isso/js/app/isso.js
+++ b/isso/js/app/isso.js
@@ -116,9 +116,9 @@ define(["app/text/html", "app/dom", "app/utils", "app/api", "app/markup", "app/i
             el.scrollIntoView();
         }
 
-        var footer = $("#isso-" + comment.id + " > .text-wrapper > footer"),
-            header = $("#isso-" + comment.id + " > .text-wrapper > header"),
-            text   = $("#isso-" + comment.id + " > .text-wrapper > div.text");
+        var footer = $("#isso-" + comment.id + " > .text-wrapper > .isso-comment-footer"),
+            header = $("#isso-" + comment.id + " > .text-wrapper > .isso-comment-header"),
+            text   = $("#isso-" + comment.id + " > .text-wrapper > .text");
 
         var form = new Postbox(comment.id);
         $("a.reply", footer).toggle("click",
diff --git a/isso/js/app/text/comment.html b/isso/js/app/text/comment.html
index ae09f9a..b4a5050 100644
--- a/isso/js/app/text/comment.html
+++ b/isso/js/app/text/comment.html
@@ -1,9 +1,9 @@
-<article class="isso-comment" id="isso-{{ id | blank }}">
+<div class="isso-comment" id="isso-{{ id | blank }}">
     <div class="avatar">
         <canvas data-hash="{{ hash }}" height="48px" width="48px"></canvas>
     </div>
     <div class="text-wrapper">
-        <header>
+        <div class="isso-comment-header" role="meta">
             {{ if bool(website) }}
             <a class="author" href="{{ website }}" rel="nofollow">
                 {{ author | blank : `i18n-comment-anonymous` }}
@@ -36,8 +36,7 @@
             {{ /if }}
             </span>
 
-
-        </header>
+        </div>
         <div class="text">
             {{ if mode | equals : 4 }}
                 <p>&nbsp;</p>
@@ -45,7 +44,7 @@
                 {{ text }}
             {{ /if }}
         </div>
-        <footer>
+        <div class="isso-comment-footer">
             {{ if likes | substract : `dislikes` | notequals : 0 }}
                 <span class="votes">{{ likes | substract : `dislikes` }}</span>
             {{ /if }}
@@ -56,8 +55,8 @@
             <a class="reply" href="#">{{ i18n-comment-reply }}</a>
             <a class="edit" href="#">{{ i18n-comment-edit }}</a>
             <a class="delete" href="#">{{ i18n-comment-delete }}</a>
-        </footer>
+        </div>
         <div class="isso-follow-up">
         </div>
     </div>
-</article>
\ No newline at end of file
+</div>
\ No newline at end of file