diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css
index 2574683e..997d25c7 100644
--- a/mediagoblin/static/css/base.css
+++ b/mediagoblin/static/css/base.css
@@ -221,20 +221,14 @@ text-align:center;
 
 /* media galleries */
 
-ul.media_thumbnail {
+.media_thumbnail {
   padding:0px;
-}
-
-li.media_thumbnail {
-  width:200px;
-  height:200px;
-  display:-moz-inline-stack;
-  display:inline-block;
-  vertical-align:top;
+  width:180px;
+  height:135px;
+  overflow:hidden;
+  float:left;
   margin:0px 10px 10px 0px;
   text-align:center;
-  zoom:1;
-. *display:inline;
 }
 
 /* icons */
diff --git a/mediagoblin/templates/mediagoblin/user_pages/gallery.html b/mediagoblin/templates/mediagoblin/user_pages/gallery.html
index 28290cfd..a434ff15 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/gallery.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/gallery.html
@@ -31,7 +31,11 @@
                       'mediagoblin.user_pages.user_home',
                       user=user.username) }}">{{ user.username }}</a>'s media</h1>
 
-    {% include "mediagoblin/utils/object_gallery.html" %}
+    </div>
+    <div class="container_16 media_gallery">
+      {% include "mediagoblin/utils/object_gallery.html" %}
+    </div>
+    <div class="grid_16">
 
     <a href={{ request.urlgen(
                    'mediagoblin.user_pages.atom_feed',
diff --git a/mediagoblin/templates/mediagoblin/utils/object_gallery.html b/mediagoblin/templates/mediagoblin/utils/object_gallery.html
index 4e2886f8..96600c33 100644
--- a/mediagoblin/templates/mediagoblin/utils/object_gallery.html
+++ b/mediagoblin/templates/mediagoblin/utils/object_gallery.html
@@ -19,17 +19,14 @@
 {% from "mediagoblin/utils/pagination.html" import render_pagination %}
 
 {% block object_gallery_content -%}
-  <div>
     {% if media_entries %}
-      <ul class="media_thumbnail">
-        {% for entry in media_entries %}
-          <li class="media_thumbnail">
-            <a href="{{ entry.url_for_self(request.urlgen) }}">
-            <img src="{{ request.app.public_store.file_url(
+      {% for entry in media_entries %}
+        <div class="media_thumbnail">
+          <a href="{{ entry.url_for_self(request.urlgen) }}">
+          <img src="{{ request.app.public_store.file_url(
 		   entry['media_files']['thumb']) }}" /></a>
-          </li>
-        {% endfor %}
-      </ul>
+        </div>
+      {% endfor %}
       {% if pagination_base_url %}
         {# different url, so set that and don't keep the get params #}
         {{ render_pagination(request, pagination, pagination_base_url, False) }}
@@ -37,5 +34,4 @@
         {{ render_pagination(request, pagination) }}
       {% endif %}
     {% endif %}
-  </div>
-{% endblock %}    
+{% endblock %}