diff --git a/templates/zephyr/home.html b/templates/zephyr/home.html
new file mode 100644
index 0000000000..f081c458d7
--- /dev/null
+++ b/templates/zephyr/home.html
@@ -0,0 +1,92 @@
+            <div id="wrapper">
+                <div class="zephyr_list" id="main_div">
+                    <br/><br/>
+                    <table class="zephyr_table" id="table">
+                        <tbody>
+                        </tbody>
+                    </table>
+                    <br/><br/>
+                    <div class="row" id="narrowbox">
+                        <div class="input-prepend input-append pull-left">
+                            <button id="show_all_messages" class="btn" disabled=disabled onclick="show_all_messages()"><i class="icon-arrow-left"></i></button>
+                            <span class="add-on"><span class="badge"><span id="currently_narrowed_to"></span><i class="badge_close_button icon-remove-sign icon-white" onclick="show_all_messages()"></i></span></span>
+                        </div>
+                    </div>
+                    <div id="bottom_whitespace"></div>
+                </div>
+            </div>
+
+                <div class="tabbable container zephyr_compose" id="zephyr_compose">
+                    <ul class="nav nav-tabs" id="zephyr-type-tabs">
+                        <li class="active"><a href="#class-message" data-toggle="tab">Stream</a></li>
+                        <li><a href="#personal-message" data-toggle="tab">Huddle</a></li>
+                        <li class="alert" id="send-status"></li>
+                        <li class="pull-right"><button type="button" class="close" onclick="hide_compose()">×</button></li>
+                    </ul>
+
+                    <div class="tab-content">
+                        <div class="tab-pane active" id="class-message">
+                            <div class="zephyr_comp">
+                                <br/>
+                                <form action="/zephyr/" method="post" class="zephyr">
+                                    <input type="hidden" name="type" value="class" />
+                                    {% csrf_token %}
+                                    <table>
+                                        <tbody>
+                                            <tr>
+                                                <td class="pointer"></td>
+                                                <td class="zephyr_recipient">
+                                                    <p>
+                                                        <span class="zephyr_label_clickable zephyr_class">
+                                                            <input type="text" class="zephyr_recipient_box" name="class" id="class" value="" placeholder="Stream"/>
+                                                        </span>
+                                                        <br/>
+                                                        <span class="zephyr_label_clickable zephyr_instance">
+                                                            <input type="text" class="zephyr_recipient_box" name="instance" id="instance" value="" placeholder="Topic"/>
+                                                        </span>
+                                                    </p>
+                                                </td>
+                                                <td class="messagebox compose">
+                                                    <img class="profile_picture" src="http://www.gravatar.com/avatar/a?d=identicon&s=30"/>
+                                                    <div class="zephyr_content">
+                                                        <textarea class="zephyr_message" name="new_zephyr" id="new_zephyr" value="" placeholder="Compose your message here..."/></textarea>
+                                                        <input type="submit" value="Send" class="btn send_zephyr"/>
+                                                    </div>
+                                                </td>
+                                            </tr>
+                                        </tbody>
+                                    </table>
+                                </form>
+                            </div>
+                        </div>
+                        <div class="tab-pane" id="personal-message">
+                            <div class="zephyr_comp">
+                                <br/>
+                                <form action="/zephyr/" method="post" class="zephyr form-inline">
+                                    <input type="hidden" name="type" value="personal" />
+                                    {% csrf_token %}
+                                    <table>
+                                        <tbody>
+                                            <tr>
+                                                <td class="pointer"></td>
+                                                <td><label class="pull-right">Huddle with</label></td>
+                                                <td><input class="input-xlarge" type="text" name="recipient" id="recipient" value="" placeholder="one or more of your friends" /></td>
+                                            </tr>
+                                            <tr>
+                                                <td class="pointer"></td>
+                                                <td class="zephyr_recipient"></td>
+                                                <td class="messagebox compose">
+                                                    <img class="profile_picture" src="http://www.gravatar.com/avatar/a?d=identicon&s=30"/>
+                                                    <div class="zephyr_content">
+                                                        <textarea class="zephyr_message" name="new_zephyr" id="new_personal_zephyr" value="" placeholder="Compose your message here..."/></textarea>
+                                                        <input type="submit" name="personal_zephyr" value="Send" class="btn send_zephyr"/>
+                                                    </div>
+                                                </td>
+                                            </tr>
+                                        </tbody>
+                                    </table>
+                                </form>
+                            </div>
+                        </div>
+                    </div>
+                </div>
diff --git a/templates/zephyr/index.html b/templates/zephyr/index.html
index d2a0633bb4..6c272310d6 100644
--- a/templates/zephyr/index.html
+++ b/templates/zephyr/index.html
@@ -51,7 +51,7 @@ var people_list = {{ people }};
                     <span class="my_email">{{ user_profile.email }}</span>
                     <span class="logout">(<a href="/accounts/logout?next=/">not you?</a>)</span>
                     <li class="active"><a href="#home" data-toggle="pill">Home</a></li>
-                    <li><a href="subscriptions/">Manage subscriptions</a></li>
+                    <li><a href="#subscriptions" data-toggle="pill">Manage subscriptions</a></li>
                     <li class="disabled"><a href="#">View starred messages</a></li>
                     <li><a href="#search" data-toggle="pill">Search</a></li>
                     <li class="disabled"><a href="#">Invite a friend</a></li>
@@ -61,104 +61,16 @@ var people_list = {{ people }};
             </div><!--/.well -->
         </div><!--/span-->
         <div class="tab-content">
-          <div class="tab-pane" id="search">
-            <h1>Search</h1>
-          </div>
-          <div class="tab-pane active" id="home">
-            <div id="wrapper">
-              <div class="zephyr_list" id="main_div">
-                <br/><br/>
-                <table class="zephyr_table" id="table">
-                    <tbody>
-                    </tbody>
-                </table>
-                <br/><br/>
-                <div class="row" id="narrowbox">
-                    <div class="input-prepend input-append pull-left">
-                        <button id="show_all_messages" class="btn" disabled=disabled onclick="show_all_messages()"><i class="icon-arrow-left"></i></button>
-                        <span class="add-on"><span class="badge"><span id="currently_narrowed_to"></span><i class="badge_close_button icon-remove-sign icon-white" onclick="show_all_messages()"></i></span></span>
-                    </div>
-                </div>
-                <div id="bottom_whitespace"></div>
-              </div>
+            <div class="tab-pane active" id="home">
+                {% include "zephyr/home.html" %}
             </div>
-
-            <div class="tabbable container zephyr_compose" id="zephyr_compose">
-                <ul class="nav nav-tabs" id="zephyr-type-tabs">
-                    <li class="active"><a href="#class-message" data-toggle="tab">Stream</a></li>
-                    <li><a href="#personal-message" data-toggle="tab">Huddle</a></li>
-                    <li class="alert" id="send-status"></li>
-                    <li class="pull-right"><button type="button" class="close" onclick="hide_compose()">×</button></li>
-                </ul>
-
-                <div class="tab-content">
-                    <div class="tab-pane active" id="class-message">
-                        <div class="zephyr_comp">
-                            <br/>
-                            <form action="/zephyr/" method="post" class="zephyr">
-                                <input type="hidden" name="type" value="class" />
-                                {% csrf_token %}
-                                <table>
-                                    <tbody>
-                                        <tr>
-                                            <td class="pointer"></td>
-                                            <td class="zephyr_recipient">
-                                                <p>
-                                                <span class="zephyr_label_clickable zephyr_class">
-                                                    <input type="text" class="zephyr_recipient_box" name="class" id="class" value="" placeholder="Stream"/>
-                                                </span>
-                                                <br/>
-                                                <span class="zephyr_label_clickable zephyr_instance">
-                                                    <input type="text" class="zephyr_recipient_box" name="instance" id="instance" value="" placeholder="Topic"/>
-                                                </span>
-                                                </p>
-                                            </td>
-                                            <td class="messagebox compose">
-                                                <img class="profile_picture" src="http://www.gravatar.com/avatar/a?d=identicon&s=30"/>
-                                                <div class="zephyr_content">
-                                                    <textarea class="zephyr_message" name="new_zephyr" id="new_zephyr" value="" placeholder="Compose your message here..."/></textarea>
-                                                    <input type="submit" value="Send" class="btn send_zephyr"/>
-                                                </div>
-                                            </td>
-                                        </tr>
-                                    </tbody>
-                                </table>
-                            </form>
-                        </div>
-                    </div>
-                    <div class="tab-pane" id="personal-message">
-                        <div class="zephyr_comp">
-                            <br/>
-                            <form action="/zephyr/" method="post" class="zephyr form-inline">
-                                <input type="hidden" name="type" value="personal" />
-                                {% csrf_token %}
-                                <table>
-                                    <tbody>
-                                        <tr>
-                                            <td class="pointer"></td>
-                                            <td><label class="pull-right">Huddle with</label></td>
-                                            <td><input class="input-xlarge" type="text" name="recipient" id="recipient" value="" placeholder="one or more of your friends" /></td>
-                                        </tr>
-                                        <tr>
-                                            <td class="pointer"></td>
-                                            <td class="zephyr_recipient"></td>
-                                            <td class="messagebox compose">
-                                                <img class="profile_picture" src="http://www.gravatar.com/avatar/a?d=identicon&s=30"/>
-                                                <div class="zephyr_content">
-                                                    <textarea class="zephyr_message" name="new_zephyr" id="new_personal_zephyr" value="" placeholder="Compose your message here..."/></textarea>
-                                                    <input type="submit" name="personal_zephyr" value="Send" class="btn send_zephyr"/>
-                                                </div>
-                                            </td>
-                                        </tr>
-                                    </tbody>
-                                </table>
-                            </form>
-                        </div>
-                    </div>
-                </div>
+            <div class="tab-pane" id="subscriptions">
+                {% include "zephyr/subscriptions.html" %}
             </div>
-          </div>
-        </div><!--/span-->
+            <div class="tab-pane" id="search">
+                {% include "zephyr/search.html" %}
+            </div>
+        </div><!--/tab-content-->
     </div><!--/row-->
 
 
diff --git a/templates/zephyr/search.html b/templates/zephyr/search.html
new file mode 100644
index 0000000000..22c96f63a3
--- /dev/null
+++ b/templates/zephyr/search.html
@@ -0,0 +1 @@
+<h1>Search!</h1>
diff --git a/templates/zephyr/subscriptions.html b/templates/zephyr/subscriptions.html
index 39282b4909..04ca25f0af 100644
--- a/templates/zephyr/subscriptions.html
+++ b/templates/zephyr/subscriptions.html
@@ -1,12 +1,3 @@
-{% extends "zephyr/base.html" %}
-
-{% block nav %}
-<li><a href="/accounts/logout?next=/">Log out</a></li>
-<li><a href="/subscriptions/">Manage subscriptions</a></li>
-{% endblock %}
-
-{% block content %}
-
 <script type="text/javascript">
 autofocus('#new_subscriptions');
 </script>
@@ -46,5 +37,3 @@ autofocus('#new_subscriptions');
     </form>
   </div>
 </div>
-
-{% endblock %}
diff --git a/zephyr/static/js/zephyr.js b/zephyr/static/js/zephyr.js
index 1dd8583e95..a74f11ea8c 100644
--- a/zephyr/static/js/zephyr.js
+++ b/zephyr/static/js/zephyr.js
@@ -72,7 +72,7 @@ function sub(zephyr_class) {
 
 function compose_button() {
     $('#sidebar a[href="#home"]').tab('show');
-    show_compose();
+    show_compose('class', $("#class"));
 }
 
 function hide_compose() {