diff --git a/index.html b/index.html
index 303ae21d..ce1db83b 100644
--- a/index.html
+++ b/index.html
@@ -61,6 +61,13 @@
                         </div>
                     </form>
                 </div>
+                {{#group}}
+                    <button class='new-group-update'>Update group</button>
+                    <button class='leave-group'>Leave group</button>
+                {{/group}}
+                {{^group}}
+                    <button class='end-session'>End Session</button>
+                {{/group}}
                 <div class='extension-details'>
                     <ul>
                         <li>Signal for Chrome</li>
diff --git a/js/views/conversation_view.js b/js/views/conversation_view.js
index ed07d237..9bd4bcf5 100644
--- a/js/views/conversation_view.js
+++ b/js/views/conversation_view.js
@@ -18,12 +18,17 @@
     window.Whisper = window.Whisper || {};
 
     Whisper.ConversationView = Backbone.View.extend({
-        className: 'conversation',
+        className: function() {
+            return [ 'conversation', this.model.get('type') ].join(' ');
+        },
         initialize: function() {
             this.listenTo(this.model, 'destroy', this.stopListening); // auto update
             this.template = $('#conversation').html();
             Mustache.parse(this.template);
-            this.$el.html(Mustache.render(this.template));
+
+            this.$el.html(Mustache.render(this.template,
+                { group: this.model.get('type') === 'group' }
+            ));
 
             this.fileInput = new Whisper.FileInputView({
                 el: this.$el.find('.attachments')
@@ -35,11 +40,6 @@
             this.$el.find('.discussion-container').append(this.view.el);
 
             this.model.fetchMessages({reset: true});
-
-            if (this.model.get('type') === 'group') {
-                this.$el.addClass('group');
-                this.$el.find('.send-message-area').append($('<button>').addClass('new-group-update').text('Update group'));
-            }
         },
 
         events: {