diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html
index a1382518..ddcf3ce9 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/media.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/media.html
@@ -103,11 +103,9 @@
{% include "mediagoblin/utils/prev_next.html" %}
-
Sidebar content here!
-
-
{% if media['uploader'] == request.user['_id'] or
request.user['is_admin'] %}
+
Temporary button holder
delete
{% endif %}
-
{% if media.tags %}
{% include "mediagoblin/utils/tags.html" %}
diff --git a/mediagoblin/templates/mediagoblin/utils/tags.html b/mediagoblin/templates/mediagoblin/utils/tags.html
index ade41944..32db6e31 100644
--- a/mediagoblin/templates/mediagoblin/utils/tags.html
+++ b/mediagoblin/templates/mediagoblin/utils/tags.html
@@ -17,7 +17,7 @@
#}
{% block tags_content -%}
-
Tags
+
Tags
{% for tag in media.tags %}
-