diff --git a/mediagoblin/templates/mediagoblin/media_details.html b/mediagoblin/templates/mediagoblin/media_details.html
index a00354bc..1b02c809 100644
--- a/mediagoblin/templates/mediagoblin/media_details.html
+++ b/mediagoblin/templates/mediagoblin/media_details.html
@@ -20,15 +20,15 @@
 
   {# temporarily, an "image gallery" that isn't one really ;) #}
   {% if media %}
-  <h2>Media details for {{media.title}}</h2>
-  <div>
-    <img src="{{ request.app.public_store.file_url(
-                  media.media_files.main) }}" />
-
-          <br/>Uploaded: {{ media.created}}
-          <br/>Description: {{media.description}}
-  </div>
+    <h2>Media details for {{media.title}}</h2>
+    <div>
+      <img src="{{ request.app.public_store.file_url(
+                    media.media_files.main) }}" />
+  
+      <br/>Uploaded: {{ media.created}}
+      <br/>Description: {{media.description}}
+    </div>
   {% else %}
-  <p>Sorry, no such media found.<p/>
+    <p>Sorry, no such media found.<p/>
   {% endif %}
 {% endblock %}    
diff --git a/mediagoblin/templates/mediagoblin/user_pages/user.html b/mediagoblin/templates/mediagoblin/user_pages/user.html
index 4ad34f51..4fa84430 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/user.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/user.html
@@ -18,9 +18,9 @@
 {% extends "mediagoblin/base.html" %}
 {% block mediagoblin_content -%}
   {% if user %}
-  <h2>User page for '{{user.username}}'</h2>
-  {{user}}
+    <h2>User page for '{{ user.username }}'</h2>
+    {{ user }}
   {% else %}
-  <p>Sorry, no such user found.<p/>
+    <p>Sorry, no such user found.<p/>
   {% endif %}
 {% endblock %}