diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css
index d3136788..2a05e988 100644
--- a/mediagoblin/static/css/base.css
+++ b/mediagoblin/static/css/base.css
@@ -126,8 +126,22 @@ a.mediagoblin_logo{
   padding-top: 8px;
   text-align: center;
   font-size: 0.875em;
+  clear: both;
 }
 
+.media_pane {
+  width: 640px;
+  margin-left: 0px;
+  margin-right: 10px;
+  float: left;  
+}
+
+.media_sidebar {
+  width: 280px;
+  margin-left: 10px;
+  margin-right: 0px;
+  float: left;
+}
 
 /* common website elements */
 
diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html
index b9e31667..0c3f373e 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/media.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/media.html
@@ -37,7 +37,7 @@
 {% endblock mediagoblin_head %}
 
 {% block mediagoblin_content %}
-  <div class="grid_11 alpha">
+  <div class="media_pane">
     <div class="media_image_container">
       {% block mediagoblin_media %}
         {% set display_media = request.app.public_store.file_url(
@@ -141,7 +141,7 @@
 	          media = media._id)) }}
     {% endif %}
   </div>
-  <div class="grid_5 omega">
+  <div class="media_sidebar">
     {% trans user_url=request.urlgen(
                 'mediagoblin.user_pages.user_home',
                 user=media.get_uploader().username),