diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css
index 950954cb..3a38f405 100644
--- a/mediagoblin/static/css/base.css
+++ b/mediagoblin/static/css/base.css
@@ -161,6 +161,10 @@ a.logo {
   margin: 6px 8px 6px 0;
 }
 
+.welcomeimage {
+  float: right;
+}
+
 .fine_print {
   font-size: 0.8em;
 }
@@ -816,6 +820,7 @@ pre {
   
   .button_action, .button_action_highlight, .button_form { 
     padding: 5px 14px;
+    margin-bottom: 0.5em;
   }
     
 }
@@ -861,6 +866,14 @@ pre {
   .header_right {
     text-align: center;
   }
+
+  .welcomeimage {
+    float: none;
+    display: inherit;
+    margin-left: auto;
+    margin-right: auto;
+    margin-top: 1em;
+  }
 }
 
 /* Exif display */
diff --git a/mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html b/mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html
index 4e55e618..9d157480 100644
--- a/mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html
+++ b/mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html
@@ -19,29 +19,34 @@
 {% if request.user %}
     <h1>{% trans %}Explore{% endtrans %}</h1>
   {% else %}
-    <img class="right_align" src="{{ request.staticdirect('/images/home_goblin.png') }}" />
-    <h1>{% trans %}Hi there, welcome to this MediaGoblin site!{% endtrans %}</h1>
-    <p>{% trans %}This site is running <a href="http://mediagoblin.org">MediaGoblin</a>, an extraordinarily great piece of media hosting software.{% endtrans %}</p>
-    {% if auth %}
-    <p>{% trans %}To add your own media, place comments, and more, you can log in with your MediaGoblin account.{% endtrans %}</p>
-    {% if allow_registration %}
-      <p>{% trans %}Don't have one yet? It's easy!{% endtrans %}</p>
-      <a class="button_action_highlight" href=
-        {% if persona_auth is defined %}
-          "javascript:;" id="persona_login1"
-        {% else %}
-          "{{ request.urlgen('mediagoblin.auth.register') }}"
+    <div class="row hell">
+      <div class="eleven columns">
+        <h1>{% trans %}Hi there, welcome to this MediaGoblin site!{% endtrans %}</h1>
+        <p>{% trans %}This site is running <a href="http://mediagoblin.org">MediaGoblin</a>, an extraordinarily great piece of media hosting software.{% endtrans %}</p>
+        {% if auth %}
+        <p>{% trans %}To add your own media, place comments, and more, you can log in with your MediaGoblin account.{% endtrans %}</p>
+        {% if allow_registration %}
+          <p>{% trans %}Don't have one yet? It's easy!{% endtrans %}</p>
+          <a class="button_action_highlight" href=
+            {% if persona_auth is defined %}
+              "javascript:;" id="persona_login1"
+            {% else %}
+              "{{ request.urlgen('mediagoblin.auth.register') }}"
+            {% endif %}
+            {% trans %}
+            >Create an account at this site</a>
+            or
+          {%- endtrans %}
         {% endif %}
-        {% trans %}
-        >Create an account at this site</a>
-        or
-      {%- endtrans %}
-    {% endif %}
-    {% endif %}
-      {% trans %}
-        <a class="button_action" href="http://mediagoblin.readthedocs.org/">Set up MediaGoblin on your own server</a>
-      {%- endtrans %}
-
+        {% endif %}
+          {% trans %}
+            <a class="button_action" href="http://mediagoblin.readthedocs.org/">Set up MediaGoblin on your own server</a>
+          {%- endtrans %}
+      </div>
+      <div class="four columns offset-by-one">
+        <img class="welcomeimage" src="/mgoblin_static/images/home_goblin.png">
+      </div>
+    </div>
     <div class="clear"></div>
   {% endif %}