diff --git a/templates/zephyr/home.html b/templates/zephyr/home.html
index 1ebf4b3989..b0b44c44af 100644
--- a/templates/zephyr/home.html
+++ b/templates/zephyr/home.html
@@ -27,11 +27,14 @@
                     <br/><br/>
                     <div id="bottom_whitespace"></div>
                 </div>
+    </div>
+  </div>
 
-                <div class="compose" id="compose">
-                        <div class="alert" id="send-status"></div>
-                        <div class="close composebox-close" onclick="hide_compose()">&times;</div>
+  <div class="row">
+    <div class="span9 compose" id="compose">
+      <div class="close composebox-close" onclick="hide_compose()">&times;</div>
                         <div class="message_comp">
+                        <div class="alert" id="send-status"></div>
                                 <form action="/send_message/" method="post" class="zephyr">
                                     <input type="hidden" name="type" value="stream" id="new_message_type"/>
                                     {% csrf_token %}
@@ -77,5 +80,5 @@
                                 </form>
                         </div>
                 </div>
-    </div>
   </div>
+
diff --git a/zephyr/static/styles/zephyr.css b/zephyr/static/styles/zephyr.css
index f666f7135f..bbdb892c5a 100644
--- a/zephyr/static/styles/zephyr.css
+++ b/zephyr/static/styles/zephyr.css
@@ -42,7 +42,11 @@ ul#sidebar {
 .message_comp {
     display: none;
     border: 1px solid #EEE;
-    border-top: 0px;
+    max-width: 640px;
+    background-color: white;
+    padding-left: 10px;
+    padding-right: 20px;
+    padding-top: 5px;
 }
 
 td.pointer {
@@ -147,9 +151,9 @@ table.message_table {
 }
 
 table.compose_table {
-    /* = message_list */
-    width: 640px;
     table-layout: fixed;
+    margin-left: auto;
+    width: 100%;
 }
 
 table.focused_table {
@@ -208,14 +212,12 @@ img.profile_picture {
     position: fixed;
     bottom: 0px;
     background: white;
-    /* = message_list.padding-left */
-    padding-left: 10px;
-    /* = message_list.width + padding-right */
-    width: 670px;
+    max-width: 670px;
 }
 
 /* Like .nav-tabs > li > a */
 #send-status {
+    width: 90%;
     padding: 8px 14px 8px 14px;
     line-height: 20px;
 }
@@ -234,8 +236,7 @@ img.profile_picture {
 }
 
 .composebox-close {
-  padding-top: 5px;
-  padding-right: 8px;
+    padding: 5px;
 }
 
 .send-status-close:hover {