diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html
index 0d1177b8..29d7874c 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/media.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/media.html
@@ -115,15 +115,17 @@
           </div>
         </form>
       {% endif %}
+      <ul style="list-style:none">
       {% for comment in comments %}
         {% set comment_author = comment.get_author %}
-	        {% if pagination.active_id == comment.id %}
-            <div class="comment_wrapper comment_active" id="comment-{{ comment.id }}">
-		          <a name="comment" id="comment"></a>
-          {% else %}
-            <div class="comment_wrapper" id="comment-{{ comment.id }}">
-	        {% endif %}
-	        <div class="comment_author">
+        <li id="comment-{{ comment.id }}"
+          {%- if pagination.active_id == comment.id %}
+            class="comment_wrapper comment_active">
+            <a name="comment" id="comment"></a>
+          {%- else %}
+            class="comment_wrapper">
+          {%- endif %}
+          <div class="comment_author">
             <img src="{{ request.staticdirect('/images/icon_comment.png') }}" />
             <a href="{{ request.urlgen('mediagoblin.user_pages.user_home',
                             user = comment_author.username) }}">
@@ -142,8 +144,9 @@
               {{ comment.content_html }}
             {%- endautoescape %}
           </div>
-        </div>
+        </li>
       {% endfor %}
+      </ul>
       {{ render_pagination(request, pagination,
                  media.url_for_self(request.urlgen)) }}
     {% endif %}