diff --git a/index.html b/index.html
index 8f3dc1142..c3db7690c 100644
--- a/index.html
+++ b/index.html
@@ -154,7 +154,7 @@
         <script type="text/javascript" src="js/views/conversation_list_view.js"></script>
         <script type="text/javascript" src="js/views/conversation_view.js"></script>
         <script type="text/javascript" src="js/views/new_conversation_view.js"></script>
-        <script type="text/javascript" src="js/views/new_message_button.js"></script>
+        <script type="text/javascript" src="js/views/new_group_view.js"></script>
         <script type="text/javascript" src="js/popup.js"></script>
     </body>
 </html>
diff --git a/js/popup.js b/js/popup.js
index 6ce115476..d039d5cfc 100644
--- a/js/popup.js
+++ b/js/popup.js
@@ -21,12 +21,26 @@ Whisper.Layout = new (Backbone.View.extend({
 		this.resize();
 
 		new Whisper.ConversationListView({el: $('#contacts')});
-		new Whisper.Header({el: $('#header')});
+		window.addEventListener('resize', this.resize.bind(this));
 		Whisper.Threads.fetch({reset: true});
 	},
 	events: {
-		'resize': 'resize'
-	},
+		'click #new-message': 'new_message',
+		'click #new-group': 'new_group'
+    },
+
+    new_message: function(e) {
+      e.preventDefault();
+      $('.conversation').hide().trigger('close'); // detach any existing conversation views
+      this.view = new Whisper.NewConversationView();
+      //todo: less new
+    },
+
+    new_group: function(e) {
+      e.preventDefault();
+      $('.conversation').trigger('close'); // detach any existing conversation views
+      new Whisper.NewGroupView({ el: $('.conversation') });
+    },
 	resize: function (e) {
 		var windowheight = window.innerHeight;
 		var form = $('.send-message-area').outerHeight();
@@ -45,7 +59,7 @@ Whisper.Layout = new (Backbone.View.extend({
 		$(content).insertAfter(this.gutter);
 		this.resize();
 	}
-}))({el: window});
+}))({el: document});
 
 textsecure.registerOnLoadFunction(function() {
 	if (textsecure.storage.getUnencrypted("number_id") === undefined) {
diff --git a/js/views/new_message_button.js b/js/views/new_group_view.js
similarity index 66%
rename from js/views/new_message_button.js
rename to js/views/new_group_view.js
index d9099c839..8cf1575e6 100644
--- a/js/views/new_message_button.js
+++ b/js/views/new_group_view.js
@@ -43,24 +43,4 @@ var Whisper = Whisper || {};
     }
   });
 
-  Whisper.Header = Backbone.View.extend({
-    events: {
-      'click #new-message': 'new_message',
-      'click #new-group': 'new_group'
-    },
-
-    new_message: function(e) {
-      e.preventDefault();
-      $('.conversation').hide().trigger('close'); // detach any existing conversation views
-      this.view = new Whisper.NewConversationView();
-      //todo: less new
-    },
-
-    new_group: function(e) {
-      e.preventDefault();
-      $('.conversation').trigger('close'); // detach any existing conversation views
-      new Whisper.NewGroupView({ el: $('.conversation') });
-    }
-  });
-
 })();