diff --git a/src/app/party.coffee b/src/app/party.coffee
index c81d72b1d9..a9f9549ad1 100644
--- a/src/app/party.coffee
+++ b/src/app/party.coffee
@@ -41,9 +41,7 @@ module.exports.app = (appExports, model) ->
 
   appExports.partyAccept = ->
     invitation = user.get('party.invitation')
-    debugger
     model.subscribe model.query("parties").withId(invitation), (err, parties) ->
-      debugger
       throw err if err
       party = parties.at(0)
       party.push 'members', user.get('id')
@@ -51,7 +49,6 @@ module.exports.app = (appExports, model) ->
       user.set 'party.current', party.get('id')
       model.ref '_party', party
       model.subscribe model.query('users').party(party.get('members')), (err, members) ->
-        debugger
         throw err if err
         model.ref '_partyMembers', members
 
@@ -63,8 +60,7 @@ module.exports.app = (appExports, model) ->
     # TODO notify sender
 
   appExports.partyLeave = ->
-    debugger
-    user.set 'party.current', null
+    id = user.set 'party.current', null
     party = model.at '_party'
     members = party.get('members')
     index = members.indexOf(user.get('id'))
@@ -72,9 +68,9 @@ module.exports.app = (appExports, model) ->
     party.set 'members', members
     if (members.length == 0)
       # last member out, kill the party
-      model.del "parties.#{id}", -> window.location.reload()
-    else
-      window.location.reload()
+      model.del "parties.#{id}"
+    model.unsubscribe model.query('parties').withId(id)
+    model.set('_party', null)
 
   #exports.partyDisband = ->
 
diff --git a/views/app/index.html b/views/app/index.html
index 11124cdf2e..c22759ee92 100644
--- a/views/app/index.html
+++ b/views/app/index.html
@@ -52,9 +52,9 @@
           <p>This resets your entire account - your tasks will be deleted and your character will start over.</p>
           <p>This is highly discouraged because you'll lose historical data, which is useful for graphing your progress over time. However, some people find it useful in the beginning after playing with the app for a while.</p>
           <@footer>
-          <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
-          <button data-dismiss="modal" x-bind=click:reset class="btn btn-danger btn-large">Reset</button>
-      </@footer>
+              <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
+              <button data-dismiss="modal" x-bind=click:reset class="btn btn-danger btn-large">Reset</button>
+          </@footer>
       </app:myModal>
 
       <app:myModal modalId="why-ads-modal" header="Why Ads?">
@@ -111,26 +111,28 @@
       </@footer>
   </app:myModal>
 
-  <app:myModal modalId="party-modal" header="Party">
-      <h2>
-        {#if _user.party.current}Invite Member To "{_party.name}"
-        {else if _user.party.invitation}You're Invited To "{_party.name}"
+  <app:myModal modalId="party-modal">
+    <h2>
+        {#if _party}{_party.name}
+        {else if _user.party.invitation}You're Invited To {_party.name}
         {else}Create A Party{/}
-      </h2>
+    </h2>
 
     {#if _user.party.current}
         <!-- In a party -->
-        <ul>
+        <table class="table table-stripe">
         {#each _partyMembers as :member}
-            <li>{username(:member.auth)}</li>
+            <tr><td>{username(:member.auth)}</td><td>({:member.id})</td></tr>
         {/}
-        </ul>
-        <form x-bind="submit: partyInvite">
+        </table>
+        <form class=form-inline x-bind="submit: partyInvite">
           {#if _view.partyError}
             <div class='alert alert-danger'>{_view.partyError}</div>
           {/}
-          <input type="text" class="input-medium search-query" value="{_newPartyMember}">
-          <input type="submit" class="btn" value="Add" />
+          <div class='control-group'>
+              <input type="text" class="input-medium" placeholder="User Id" value="{_newPartyMember}">
+              <input type="submit" class="btn" value="Invite" />
+          </div>
         </form>
         <a class='btn btn-danger' x-bind="click: partyLeave">Leave</a>
 
@@ -143,17 +145,18 @@
             <a class='btn btn-danger' x-bind="click: partyReject">Reject</a>
         {else}
           <!-- Not in a party , no invites - create a new one -->
-          <form x-bind="submit: partyCreate">
+          <form class=form-inline x-bind="submit: partyCreate">
               {#if _view.partyError}
                 <div class='alert alert-danger'>{_view.partyError}</div>
               {/}
-              <input type="text" class="input-medium search-query" value="{_newParty}">
-              <input type="submit" class="btn" value="Add" />
+              <div class=control-group>
+                  <input type="text" class="input-medium" placeholder="Party Name" value="{_newParty}">
+                  <input type="submit" class="btn" value="Create" />
+              </div>
           </form>
         {/}
       {/}
 
-
   </app:myModal>
 
 <alerts:>