diff --git a/src/app/profile.coffee b/src/app/profile.coffee
index 753e48dbbf..18c35e73ee 100644
--- a/src/app/profile.coffee
+++ b/src/app/profile.coffee
@@ -19,12 +19,18 @@ module.exports.app = (appExports, model) ->
     sites.splice(i,1)
     user.set 'profile.websites', sites
 
-  appExports.profileChangeActive = (e, el) ->
-    uid = $(el).attr('data-uid')
-    model.ref '_profileActive', model.at("users.#{uid}")
-    browser.setupTooltips(model)
 
-  appExports.toggleGamePane = ->
+  toggleGamePane = ->
     model.set '_gamePane', !model.get('_gamePane'), ->
       browser.setupTooltips()
 
+  appExports.profileChangeActive = (e, el) ->
+    uid = $(el).attr('data-uid')
+    if uid is model.get('_userId') # clicked self
+      toggleGamePane()
+    else
+      model.ref '_profileActive', model.at("users.#{uid}")
+      $('#avatar-modal').modal('show')
+
+  appExports.toggleGamePane = -> toggleGamePane()
+
diff --git a/views/app/avatar.html b/views/app/avatar.html
index b670da4501..50efce61b2 100644
--- a/views/app/avatar.html
+++ b/views/app/avatar.html
@@ -12,7 +12,7 @@
                 data-level="{@profile.stats.lvl}"
                 data-checkpet="{#if @profile.items.pet}hasPet{/}"
                 data-checkuser="{{#if equal(@profile.id, _user.id)}}isUser{{/}}"
-                data-toggle='modal' data-target='#avatar-modal' data-uid="{{@profile.id}}" x-bind="click:profileChangeActive"
+                data-uid="{{@profile.id}}" x-bind="click:profileChangeActive"
                 rel="popover" data-placement="bottom" data-trigger="hover" data-html="true" data-content="
                              <div>
                                 <div class='progress progress-danger' style='height:5px;'>
diff --git a/views/app/settings.html b/views/app/settings.html
index 6a6c94b1ce..b1ac0b6c14 100644
--- a/views/app/settings.html
+++ b/views/app/settings.html
@@ -129,27 +129,21 @@
 
 <menu:>
     <div class="user-menu">
-        <table>
-            <tr style='vertical-align:top;'>
-                <td>
-                    <a class="pull-left btn {#if _gamePane}active{/}" style='cursor:pointer' x-bind='click:toggleGamePane' rel=tooltip title="Toggle Tasks / Game Options" data-placement=bottom>
-                        {#if _user.party.invitation}<i class='icon-bell'></i> {/}<img src="/favicon.ico" />
-                    </a>
-                </td>
-                <td>
-                    {{#unless _loggedIn}}
-                        <button class="task-action-btn tile solid" style='cursor:pointer' data-target="#login-modal" data-toggle="modal">Login / Register</button>
-                    {{else}}
-                        <ul class="nav site-nav">
-                            <li class="flyout">
-                                <h1 class="task-action-btn tile solid user-reporter">{{username(_user.auth, _user.profile.name)}}</h1>
-                                <ul class="flyout-content nav stacked">
-                                    <li><a class="task-action-btn tile solid" href="/logout">Logout</a></li>
-                                </ul>
-                            </li>
-                        </ul>
-                    {{/}}
-                </td>
-            </tr>
-        </table>
+        {{#unless _loggedIn}}
+            <button class="task-action-btn tile solid" style='cursor:pointer' data-target="#login-modal" data-toggle="modal">Login / Register</button>
+        {{else}}
+            <ul class="nav site-nav">
+                <li class="flyout">
+                    <h1 class="task-action-btn tile solid user-reporter">{#if _user.party.invitation}<i class='icon-bell'></i> {/}{{username(_user.auth, _user.profile.name)}}</h1>
+                    <ul class="flyout-content nav stacked">
+                        <li>
+                            <a class="task-action-btn tile solid" x-bind='click:toggleGamePane'>
+                                {#if _gamePane}Tasks{else}{#if _user.party.invitation}<i class='icon-bell'></i> {/}Options{/}
+                            </a>
+                        </li>
+                        <li><a class="task-action-btn tile solid" href="/logout">Logout</a></li>
+                    </ul>
+                </li>
+            </ul>
+        {{/}}
     </div>