diff --git a/public/javascripts/app/templates/post-form.handlebars b/public/javascripts/app/templates/post-form.handlebars
index 662c6532c..519433e64 100644
--- a/public/javascripts/app/templates/post-form.handlebars
+++ b/public/javascripts/app/templates/post-form.handlebars
@@ -1,18 +1,21 @@
 <div class='row'>
-    <div class='span12'>
-        <form class="new-post well">
-            <label>
-                text
-                <textarea class="text span8"/>
-                <textarea id="text_with_markup" style="display:none;"/>
-            </label>
-            <div class="service_selector"></div>
-            <div class="aspect_selector"></div>
-            <br/>
-
-            <input type="submit" class="btn-primary" value="Share" />
-        </form>
+    <div class='span8 offset2 new-post-section'>
 
         <div class="new_picture"/>
+
+        <form class="new-post">
+            <fieldset>
+              <legend>
+                New Post
+              </legend>
+              <textarea class="text span8"/>
+              <textarea id="text_with_markup" style="display:none;"/>
+
+              <div class="aspect_selector"></div>
+              <div class="service_selector"></div>
+
+              <input type="submit" class="btn-primary" value="Share" />
+            </fieldset>
+        </form>
     </div>
 </div>
diff --git a/public/javascripts/app/templates/post-new.handlebars b/public/javascripts/app/templates/post-new.handlebars
index 444b34422..afd1988e0 100644
--- a/public/javascripts/app/templates/post-new.handlebars
+++ b/public/javascripts/app/templates/post-new.handlebars
@@ -1 +1,3 @@
-<div id="new-post"></div>
\ No newline at end of file
+<div class="container">
+  <div id="new-post"></div>
+</div>
diff --git a/public/javascripts/app/templates/services-selector.handlebars b/public/javascripts/app/templates/services-selector.handlebars
index 6db296650..a8fd3c827 100644
--- a/public/javascripts/app/templates/services-selector.handlebars
+++ b/public/javascripts/app/templates/services-selector.handlebars
@@ -1,6 +1,7 @@
+Broadcast:
 {{#each current_user.services}}
     <input type="checkbox" name="services" class="service" value="{{provider}}" />
-    {{provider}}
+    <img src="/images/social_media_logos/{{provider}}-16x16.png" />
     <br />
 {{/each}}
 <br />
diff --git a/public/stylesheets/sass/new-templates.scss b/public/stylesheets/sass/new-templates.scss
index a295bc8cf..0ce3cb5f7 100644
--- a/public/stylesheets/sass/new-templates.scss
+++ b/public/stylesheets/sass/new-templates.scss
@@ -784,3 +784,11 @@ text-rendering: optimizelegibility;
   max-width: 200px;
   max-height: 200px;
 }
+
+.new-post-section {
+  margin-top: 100px;
+}
+
+.aspect_selector {
+  float: right;
+}