diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css
index eac956f1..c2d45a1b 100644
--- a/mediagoblin/static/css/base.css
+++ b/mediagoblin/static/css/base.css
@@ -480,11 +480,24 @@ table.media_panel th {
   line-height: 1em;
 }
 
-@media screen and (max-width: 660px) {
+/* Media queries and other responsivisivity */
+@media screen and (max-width: 680px) {
   .media_pane {
     width: 100%;
+    margin: 0px;
   }
   img.media_image {
     width: 100%;
   }
 }
+
+@media screen and (max-width: 960px) {
+  .profile_sidebar {
+    width: 100%;
+    margin: 0px;
+  }
+  .profile_showcase {
+    width: 100%;
+    margin: 0px;
+  }
+}
diff --git a/mediagoblin/templates/mediagoblin/user_pages/user.html b/mediagoblin/templates/mediagoblin/user_pages/user.html
index c8eb9026..0937f97a 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/user.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/user.html
@@ -120,12 +120,12 @@
         {% endif %}
     {% endif %}
 
-    {% if request.user and (request.user._id == user._id) %}
+      {% if request.user and (request.user._id == user._id) %}
         <a href="{{ request.urlgen('mediagoblin.edit.account') }}">
           {%- trans %}Change account settings{% endtrans -%}
         </a>
-      </div>
-    {% endif %}
+      {% endif %}
+    </div>
 
     {% if media_entries.count() %}
       <div class="profile_showcase">