diff --git a/views/options/social/tavern.jade b/views/options/social/tavern.jade
index 820b3d16a1..048b3c36ff 100644
--- a/views/options/social/tavern.jade
+++ b/views/options/social/tavern.jade
@@ -103,10 +103,11 @@
 
   .span8(ng-controller='ChatCtrl')
     h3 Tavern Talk
-      include ./chat-box
-      small
-        include ../../shared/formatting-help
-        alert.alert-info.
-          Note: if you're reporting a bug, the developers won't see it here. Please <a href='https://github.com/HabitRPG/habitrpg/issues' target='_blank'>use Github instead</a>.
+        include ./chat-box
+        small(style='position: relative; top: -20px; left: 25px;')
+            include ../../shared/formatting-help
+        small(style='position: relative; top: 18px; left: 0px')
+            alert.alert-info.
+                Note: if you're reporting a bug, the developers won't see it here. Please <a href='https://github.com/HabitRPG/habitrpg/issues' target='_blank'>use Github instead</a>.
     ul.unstyled.tavern-chat
       include ./chat-message
diff --git a/views/shared/footer.jade b/views/shared/footer.jade
index 68e7dc271f..a0e3277e57 100644
--- a/views/shared/footer.jade
+++ b/views/shared/footer.jade
@@ -23,7 +23,7 @@ footer.footer(ng-controller='FooterCtrl')
           li
             a(href='/static/extensions') Extensions
           li
-            a(href='/static/faq') FAQ
+            a(target='_blank', href='http://habitrpg.wikia.com/wiki/FAQ') FAQ
           li
             a(href='/static/privacy') Privacy
           li