diff --git a/styles/app/game-pane.styl b/styles/app/game-pane.styl
index 47c7396258..a8313f0636 100644
--- a/styles/app/game-pane.styl
+++ b/styles/app/game-pane.styl
@@ -13,7 +13,7 @@
 
 .tavern-pane
     position relative
-    height 300px
+    height 250px
 
 .tavern-chat, .party-chat
 
diff --git a/views/app/game-pane.html b/views/app/game-pane.html
index 526223b72d..f6ac3c77f9 100644
--- a/views/app/game-pane.html
+++ b/views/app/game-pane.html
@@ -75,20 +75,35 @@
 
 <tavern:>
     <div class='row-fluid'>
-        <div class='span6 border-right'>
+        <div class='span4 border-right'>
             <div class='tavern-pane'>
                 <img src='/img/npcs/daniel.png' />
                 <div class="popover fade right in" style="top: 0px; left: 135px; display: block;">
                     <div class="arrow"></div>
                     <h3 class="popover-title">Daniel Johansson</h3>
-                    <div class="popover-content">Welcome to the Tavern! I'm <a target="_blank" href="http://www.kickstarter.com/profile/2014640723">Daniel</a>, the bar keep. If you want to rest a while (going on vacation? sudden illness?), I'll set you up at the inn - dailies won't hurt you while you're resting. Stay a while & meet the locals.</div>
+                    <div class="popover-content">
+                        Welcome to the Tavern! I'm <a target="_blank" href="http://www.kickstarter.com/profile/2014640723">Daniel</a>, the bar keep. If you want to rest a while (going on vacation? sudden illness?), I'll set you up at the inn - dailies won't hurt you while you're resting. Stay a while & meet the locals.
+                        <div><button x-bind="click:toggleResting" class='btn btn-large btn-success {#if _user.flags.rest}active{/}'>{#if _user.flags.rest}Check Out of Inn{else}Rest In The Inn{/}</button></div>
+                    </div>
                 </div>
             </div>
-            <div><button x-bind="click:toggleResting" class='btn btn-large btn-success {#if _user.flags.rest}active{/}'>{#if _user.flags.rest}Check Out of Inn{else}Rest In The Inn{/}</button></div>
+
             <div class='alert alert-info {#unless _user.flags.rest}hidden{/}'>While you're resting, your dailies aren't calculated. <span class='label label-warning'>Warning:</span> this means that if you check in today, do some dailies, and check out tomorrow - they won't get un-checked until the day <strong>after</strong> tomorrow. You start where you left off before vacation / illness, and it prevents abusing the inn. See <a _target='blank' href='https://trello.com/card/rest-in-tavern/50e5d3684fe3a7266b0036d6/14'><strong>Trello</strong></a> for more information.</div>
 
+            <div class=well>
+                <h3>Resources</h3>
+                <ul class=unstyled>
+                    <li><h4><a _target=blank href="http://community.habitrpg.com/forums/lfg">LFG Posts</a></h4></li>
+                    <li><h4><a _target=blank href="http://www.youtube.com/watch?feature=player_embedded&v=cT5ghzZFfao">Tutorial</a></h4></li>
+                    <li><h4><a _target=blank href="http://localhost:3000/static/faq">FAQ</a></h4></li>
+                    <li><h4><a _target=blank href="https://github.com/lefnire/habitrpg/issues?state=open">Submit a Bug</a></h4></li>
+                    <li><h4><a _target=blank href="https://trello.com/board/habitrpg/50e5d3684fe3a7266b0036d6">Request a Feature</a></h4></li>
+                    <li><h4><a _target=blank href="http://community.habitrpg.com/forum">Community Forum</a></h4></li>
+                </ul>
+            </div>
+
         </div>
-        <div class='span6'>
+        <div class='span8'>
             <h3>Tavern Talk & LFG</h3>
             <form x-bind='submit:tavernSendChat'>
                 <textarea class="span6" rows="3"x-bind='keyup:tavernMessageKeyup'>{_tavernMessage}</textarea><br/>