diff --git a/website/client/assets/images/tavern_backdrop_web.png b/website/client/assets/images/tavern_backdrop_web.png
new file mode 100644
index 0000000000..1014540d25
Binary files /dev/null and b/website/client/assets/images/tavern_backdrop_web.png differ
diff --git a/website/client/assets/svg/bronze-guild-badge.svg b/website/client/assets/svg/bronze-guild-badge.svg
index d8b829c62b..0f7b7078ff 100644
--- a/website/client/assets/svg/bronze-guild-badge.svg
+++ b/website/client/assets/svg/bronze-guild-badge.svg
@@ -6,8 +6,8 @@
     <g fill="none" fill-rule="evenodd">
         <g transform="translate(4)">
             <use fill="#EA8C31" xlink:href="#a"/>
-            <path stroke="#B36213" stroke-width="10" d="M34.03 5.031l4.443 1.934 12.031 5.237 12.032 5.237 2.445 1.065c-.183 14.83-1.676 23.96-5.418 31.395C55.326 58.32 47.803 64.81 35 70.545 22.197 64.81 14.674 58.32 10.437 49.9c-3.742-7.435-5.235-16.565-5.418-31.395L35 5.454l-.97-.423z"/>
-            <path stroke="#D77A20" stroke-width="6" d="M34.421 3.02a506596810.815 506596810.815 0 0 0 16.882 7.348l12.03 5.237 3.66 1.593c-.111 15.9-1.621 25.609-5.643 33.6C56.795 59.848 48.69 66.734 35 72.733c-13.691-6-21.795-12.885-26.35-21.935-4.022-7.991-5.532-17.7-5.643-33.6L35 3.272l-.579-.252z"/>
+            <path stroke="#B36213" stroke-width="10" d="M35 5.453L5.02 18.503c.182 14.831 1.675 23.961 5.417 31.396C14.674 58.32 22.197 64.81 35 70.545 47.803 64.81 55.326 58.32 59.563 49.9c3.742-7.435 5.235-16.565 5.418-31.395l-2.445-1.065L38.473 6.965l-4.442-1.934.969.422z"/>
+            <path stroke="#D77A20" stroke-width="6" d="M35 3.272L3.007 17.198c.111 15.9 1.621 25.609 5.643 33.6C13.205 59.848 21.31 66.734 35 72.733c13.691-6 21.795-12.885 26.35-21.935 4.022-7.991 5.532-17.7 5.643-33.6l-3.66-1.593L39.272 5.131l-4.85-2.111.579.252z"/>
         </g>
         <g transform="translate(4)">
             <use fill="#FFF" xlink:href="#b"/>
diff --git a/website/client/assets/svg/facebook.svg b/website/client/assets/svg/facebook.svg
index 314d9515ad..3150f4d0f9 100644
--- a/website/client/assets/svg/facebook.svg
+++ b/website/client/assets/svg/facebook.svg
@@ -1,3 +1,3 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="8" height="16" viewBox="0 0 8 16">
-    <path fill="#878190" fill-rule="evenodd" d="M7.145 8.006H4.903V16H1.58V8.006H0V5.182h1.58V3.354C1.58 2.045 2.202 0 4.933 0l2.461.01v2.742H5.608c-.291 0-.705.145-.705.77v1.66h2.533l-.291 2.824z"/>
+    <path fill-rule="evenodd" d="M7.145 8.006H4.903V16H1.58V8.006H0V5.182h1.58V3.354C1.58 2.045 2.202 0 4.933 0l2.461.01v2.742H5.608c-.291 0-.705.145-.705.77v1.66h2.533l-.291 2.824z"/>
 </svg>
diff --git a/website/client/assets/svg/instagram.svg b/website/client/assets/svg/instagram.svg
new file mode 100644
index 0000000000..a37ec8a55d
--- /dev/null
+++ b/website/client/assets/svg/instagram.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+    <path fill="#E1E0E3" fill-rule="evenodd" d="M8 0c2.173 0 2.445.01 3.298.048.852.04 1.433.174 1.942.372.526.205.973.478 1.418.922.444.445.717.892.922 1.418.198.509.333 1.09.372 1.942C15.99 5.555 16 5.827 16 8s-.01 2.445-.048 3.298c-.04.852-.174 1.433-.372 1.942a3.924 3.924 0 0 1-.922 1.418 3.924 3.924 0 0 1-1.418.922c-.509.198-1.09.333-1.942.372-.853.04-1.125.048-3.298.048s-2.445-.009-3.298-.048c-.852-.04-1.433-.174-1.942-.372a3.924 3.924 0 0 1-1.418-.922A3.924 3.924 0 0 1 .42 13.24c-.198-.509-.333-1.09-.372-1.942C.01 10.445 0 10.173 0 8s.01-2.445.048-3.298C.088 3.85.222 3.269.42 2.76c.205-.526.478-.973.922-1.418A3.924 3.924 0 0 1 2.76.42C3.269.222 3.85.087 4.702.048 5.555.01 5.827 0 8 0zm0 3.892a4.108 4.108 0 1 0 0 8.216 4.108 4.108 0 0 0 0-8.216zm5.23-.162a.96.96 0 1 0-1.92 0 .96.96 0 0 0 1.92 0zM8 10.667a2.666 2.666 0 1 1 0-5.333 2.666 2.666 0 0 1 0 5.333z"/>
+</svg>
diff --git a/website/client/assets/svg/tier-champion-2-icon.svg b/website/client/assets/svg/tier-champion-2-icon.svg
new file mode 100644
index 0000000000..c6dc35db27
--- /dev/null
+++ b/website/client/assets/svg/tier-champion-2-icon.svg
@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="8" height="8" viewBox="0 0 8 8">
+    <defs>
+        <path id="a" d="M290 1705h8v8h-8z"/>
+    </defs>
+    <g fill="none" fill-rule="evenodd" transform="translate(-290 -1705)">
+        <use fill="#3FDAA2" xlink:href="#a"/>
+        <path stroke="#000" stroke-opacity=".1" d="M290.5 1705.5h7v7h-7z"/>
+    </g>
+</svg>
diff --git a/website/client/assets/svg/tier-champion-icon.svg b/website/client/assets/svg/tier-champion-icon.svg
new file mode 100644
index 0000000000..299716dca1
--- /dev/null
+++ b/website/client/assets/svg/tier-champion-icon.svg
@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="8" height="8" viewBox="0 0 8 8">
+    <defs>
+        <path id="a" d="M290 1649h8v8h-8z"/>
+    </defs>
+    <g fill="none" fill-rule="evenodd" transform="translate(-290 -1649)">
+        <use fill="#FFBE5D" xlink:href="#a"/>
+        <path stroke="#000" stroke-opacity=".1" d="M290.5 1649.5h7v7h-7z"/>
+    </g>
+</svg>
diff --git a/website/client/assets/svg/tier-elite-2-icon.svg b/website/client/assets/svg/tier-elite-2-icon.svg
new file mode 100644
index 0000000000..ce281f5eb2
--- /dev/null
+++ b/website/client/assets/svg/tier-elite-2-icon.svg
@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="11" height="11" viewBox="0 0 11 11">
+    <defs>
+        <path id="a" d="M275.5 1601.083L270 1591h11z"/>
+    </defs>
+    <g fill="none" fill-rule="evenodd" transform="rotate(-180 140.5 800.542)">
+        <use fill="#FF944C" xlink:href="#a"/>
+        <path stroke="#000" stroke-opacity=".1" d="M275.5 1600.04l4.658-8.54h-9.316l4.658 8.54z"/>
+    </g>
+</svg>
diff --git a/website/client/assets/svg/tier-elite-icon.svg b/website/client/assets/svg/tier-elite-icon.svg
new file mode 100644
index 0000000000..82d6c7d15a
--- /dev/null
+++ b/website/client/assets/svg/tier-elite-icon.svg
@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="11" height="11" viewBox="0 0 11 11">
+    <defs>
+        <path id="a" d="M275.5 1545.083L270 1535h11z"/>
+    </defs>
+    <g fill="none" fill-rule="evenodd" transform="rotate(-180 140.5 772.542)">
+        <use fill="#FF6165" xlink:href="#a"/>
+        <path stroke="#000" stroke-opacity=".1" d="M275.5 1544.04l4.658-8.54h-9.316l4.658 8.54z"/>
+    </g>
+</svg>
diff --git a/website/client/assets/svg/tier-friend-2-icon.svg b/website/client/assets/svg/tier-friend-2-icon.svg
new file mode 100644
index 0000000000..507470c101
--- /dev/null
+++ b/website/client/assets/svg/tier-friend-2-icon.svg
@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="10" height="10" viewBox="0 0 10 10">
+    <defs>
+        <path id="a" d="M282 1480l4.33 2.5v5L282 1490l-4.33-2.5v-5z"/>
+    </defs>
+    <g fill="none" fill-rule="evenodd" transform="translate(-277 -1480)">
+        <use fill="#C92B2B" xlink:href="#a"/>
+        <path stroke="#000" stroke-opacity=".1" d="M282 1480.577l-3.83 2.212v4.422l3.83 2.212 3.83-2.212v-4.422l-3.83-2.212z"/>
+    </g>
+</svg>
diff --git a/website/client/assets/svg/tier-friend-icon.svg b/website/client/assets/svg/tier-friend-icon.svg
new file mode 100644
index 0000000000..e792ee2486
--- /dev/null
+++ b/website/client/assets/svg/tier-friend-icon.svg
@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="10" height="10" viewBox="0 0 10 10">
+    <defs>
+        <path id="a" d="M282 1424l4.33 2.5v5L282 1434l-4.33-2.5v-5z"/>
+    </defs>
+    <g fill="none" fill-rule="evenodd" transform="translate(-277 -1424)">
+        <use fill="#FFB6B8" xlink:href="#a"/>
+        <path stroke="#000" stroke-opacity=".1" d="M282 1424.577l-3.83 2.212v4.422l3.83 2.212 3.83-2.212v-4.422l-3.83-2.212z"/>
+    </g>
+</svg>
diff --git a/website/client/assets/svg/tier-legendary-icon.svg b/website/client/assets/svg/tier-legendary-icon.svg
new file mode 100644
index 0000000000..0bfaab2922
--- /dev/null
+++ b/website/client/assets/svg/tier-legendary-icon.svg
@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="12" height="12" viewBox="0 0 12 12">
+    <defs>
+        <path id="a" d="M290.657 1760.657h8v8h-8z"/>
+    </defs>
+    <g fill="none" fill-rule="evenodd" transform="rotate(-45 -1973.144 1234.01)">
+        <use fill="#5EDDE9" xlink:href="#a"/>
+        <path stroke="#000" stroke-opacity=".1" d="M291.157 1761.157h7v7h-7z"/>
+    </g>
+</svg>
diff --git a/website/client/assets/svg/tier-mod-icon.svg b/website/client/assets/svg/tier-mod-icon.svg
new file mode 100644
index 0000000000..14d709d003
--- /dev/null
+++ b/website/client/assets/svg/tier-mod-icon.svg
@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="12" height="11" viewBox="0 0 12 11">
+    <defs>
+        <path id="a" d="M304.706 1824.306l-3.526 1.548.383-3.833-2.563-2.875 3.763-.82 1.943-3.326 1.943 3.326 3.764.82-2.563 2.875.383 3.833z"/>
+    </defs>
+    <g fill="none" fill-rule="evenodd" transform="translate(-299 -1815)">
+        <use fill="#2995CD" xlink:href="#a"/>
+        <path stroke="#000" stroke-opacity=".1" d="M307.65 1825.052l-.32-3.2 2.14-2.4-3.142-.685-1.622-2.776-1.622 2.776-3.141.685 2.139 2.4-.32 3.2 2.944-1.292 2.944 1.292z"/>
+    </g>
+</svg>
diff --git a/website/client/assets/svg/tier-npc-icon.svg b/website/client/assets/svg/tier-npc-icon.svg
new file mode 100644
index 0000000000..222ef53444
--- /dev/null
+++ b/website/client/assets/svg/tier-npc-icon.svg
@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="8" height="10" viewBox="0 0 8 10">
+    <defs>
+        <path id="a" d="M247 1928h10l-3 4 3 4h-10v-4z"/>
+    </defs>
+    <g fill="none" fill-rule="evenodd" transform="rotate(90 1091.5 844.5)">
+        <use fill="#77F4C7" xlink:href="#a"/>
+        <path stroke="#005737" d="M247.5 1928.5v7h8.5l-2.625-3.5 2.625-3.5h-8.5z"/>
+    </g>
+</svg>
diff --git a/website/client/assets/svg/tier-staff-icon.svg b/website/client/assets/svg/tier-staff-icon.svg
new file mode 100644
index 0000000000..209501178f
--- /dev/null
+++ b/website/client/assets/svg/tier-staff-icon.svg
@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="10" height="8" viewBox="0 0 10 8">
+    <defs>
+        <path id="a" d="M275 1873v8h10v-8l-3 3-2.036-2.965L278 1876z"/>
+    </defs>
+    <g fill="none" fill-rule="evenodd" transform="translate(-275 -1873)">
+        <use fill="#9A62FF" xlink:href="#a"/>
+        <path stroke="#000" stroke-opacity=".1" d="M275.5 1874.207v6.293h9v-6.293l-2.572 2.572-1.956-2.85-1.893 2.857-2.579-2.579z"/>
+    </g>
+</svg>
diff --git a/website/client/assets/svg/twitter.svg b/website/client/assets/svg/twitter.svg
index 3606bb754b..c48698bcdb 100644
--- a/website/client/assets/svg/twitter.svg
+++ b/website/client/assets/svg/twitter.svg
@@ -1,3 +1,3 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="16" height="13" viewBox="0 0 16 13">
-    <path fill="#878190" fill-rule="evenodd" d="M14.362 3.238c.007.141.01.281.01.424 0 4.338-3.302 9.34-9.34 9.34A9.284 9.284 0 0 1 0 11.527c.257.029.518.045.783.045a6.576 6.576 0 0 0 4.076-1.404 3.288 3.288 0 0 1-3.065-2.28 3.312 3.312 0 0 0 1.481-.056A3.288 3.288 0 0 1 .642 4.613v-.041c.444.246.949.393 1.488.41A3.28 3.28 0 0 1 .67 2.25c0-.602.162-1.166.444-1.651a9.315 9.315 0 0 0 6.766 3.43A3.28 3.28 0 0 1 11.078 0c.943 0 1.797.398 2.395 1.035a6.565 6.565 0 0 0 2.085-.797 3.289 3.289 0 0 1-1.443 1.816A6.543 6.543 0 0 0 16 1.539a6.665 6.665 0 0 1-1.638 1.699"/>
+    <path fill-rule="evenodd" d="M14.362 3.238c.007.141.01.281.01.424 0 4.338-3.302 9.34-9.34 9.34A9.284 9.284 0 0 1 0 11.527c.257.029.518.045.783.045a6.576 6.576 0 0 0 4.076-1.404 3.288 3.288 0 0 1-3.065-2.28 3.312 3.312 0 0 0 1.481-.056A3.288 3.288 0 0 1 .642 4.613v-.041c.444.246.949.393 1.488.41A3.28 3.28 0 0 1 .67 2.25c0-.602.162-1.166.444-1.651a9.315 9.315 0 0 0 6.766 3.43A3.28 3.28 0 0 1 11.078 0c.943 0 1.797.398 2.395 1.035a6.565 6.565 0 0 0 2.085-.797 3.289 3.289 0 0 1-1.443 1.816A6.543 6.543 0 0 0 16 1.539a6.665 6.665 0 0 1-1.638 1.699"/>
 </svg>
diff --git a/website/client/components/achievements/wonChallenge.vue b/website/client/components/achievements/wonChallenge.vue
index 4c20a96577..2f0460b6c1 100644
--- a/website/client/components/achievements/wonChallenge.vue
+++ b/website/client/components/achievements/wonChallenge.vue
@@ -3,7 +3,7 @@
     .modal-content(style='min-width:28em')
       .modal-body.text-center
         h3(style='margin-bottom: 0') {{ $t('wonChallenge') }}
-        // @TODO: h4: markdown(text='user.achievements.challenges[user.achievements.challenges.length - 1]')
+        h4(v-markdown='user.achievements.challenges[user.achievements.challenges.length - 1]')
         .container-fluid
           .row(style='margin-bottom:1em')
             .col-xs-4(style='padding:0')
@@ -43,12 +43,20 @@
 </style>
 
 <script>
+import { mapState } from 'client/libs/store';
 import bModal from 'bootstrap-vue/lib/components/modal';
+import markdownDirective from 'client/directives/markdown';
 
 export default {
   components: {
     bModal,
   },
+  directives: {
+    markdown: markdownDirective,
+  },
+  computed: {
+    ...mapState({user: 'user.data'}),
+  },
   data () {
     let tweet = this.$t('wonChallengeShare');
     return {
diff --git a/website/client/components/appFooter.vue b/website/client/components/appFooter.vue
index 01668a1658..59539140f2 100644
--- a/website/client/components/appFooter.vue
+++ b/website/client/components/appFooter.vue
@@ -62,11 +62,14 @@
           .col-6
             h3 Social
             .social-circle
-              a(href='https://twitter.com/habitica', target='_blank') Twitter
+              a(href='https://twitter.com/habitica', target='_blank')
+                .social-icon.svg-icon(v-html='icons.twitter')
             .social-circle
-              a(href='https://www.instagram.com/habitica/', target='_blank') Instagram
+              a(href='https://www.instagram.com/habitica/', target='_blank')
+                .social-icon.svg-icon(v-html='icons.instagram')
             .social-circle
-              a(href='https://www.facebook.com/Habitica', target='_blank') Facebook
+              a(href='https://www.facebook.com/Habitica', target='_blank')
+                .social-icon.facebook.svg-icon(v-html='icons.facebook')
         .row
           .col-10
             | We’re an open source project that depends on our users for support. The money you donate helps us keep the servers running, maintain a small staff, develop new features, and provide incentives for our volunteers.
@@ -77,32 +80,32 @@
     .row
       .col-4
         | © 2017 Habitica. All rights reserved.
+        .debug.float-left(v-if='!IS_PRODUCTION')
+          button.btn.btn-primary(@click='debugMenuShown = !debugMenuShown') Toggle Debug Menu
+          .debug-group(v-if='debugMenuShown')
+            a.btn.btn-default(@click='setHealthLow()') Health = 1
+            a.btn.btn-default(@click='addMissedDay(1)') +1 Missed Day
+            a.btn.btn-default(@click='addMissedDay(2)') +2 Missed Days
+            a.btn.btn-default(@click='addMissedDay(8)') +8 Missed Days
+            a.btn.btn-default(@click='addMissedDay(32)') +32 Missed Days
+            a.btn.btn-default(@click='addTenGems()') +10 Gems
+            a.btn.btn-default(@click='addHourglass()') +1 Mystic Hourglass
+            a.btn.btn-default(@click='addGold()') +500GP
+            a.btn.btn-default(@click='plusTenHealth()') + 10HP
+            a.btn.btn-default(@click='addMana()') +MP
+            a.btn.btn-default(@click='addLevelsAndGold()') +Exp +GP +MP
+            a.btn.btn-default(@click='addOneLevel()') +1 Level
+            a.btn.btn-default(@click='addQuestProgress()' tooltip="+1000 to boss quests. 300 items to collection quests") Quest Progress Up
+            a.btn.btn-default(@click='makeAdmin()') Make Admin
+            a.btn.btn-default(@click='openModifyInventoryModal()') Modify Inventory
       .col-4.text-center
         .logo.svg-icon(v-html='icons.gryphon')
       .col-4.text-right
         span Privacy Policy
         span Terms of Use
-    .row
-      h4 Debug
-      .btn-group-vertical
-        a.btn.btn-default(@click='setHealthLow()') Health = 1
-        a.btn.btn-default(@click='addMissedDay(1)') +1 Missed Day
-        a.btn.btn-default(@click='addMissedDay(2)') +2 Missed Days
-        a.btn.btn-default(@click='addMissedDay(8)') +8 Missed Days
-        a.btn.btn-default(@click='addMissedDay(32)') +32 Missed Days
-        a.btn.btn-default(@click='addTenGems()') +10 Gems
-        a.btn.btn-default(@click='addHourglass()') +1 Mystic Hourglass
-        a.btn.btn-default(@click='addGold()') +500GP
-        a.btn.btn-default(@click='plusTenHealth()') + 10HP
-        a.btn.btn-default(@click='addMana()') +MP
-        a.btn.btn-default(@click='addLevelsAndGold()') +Exp +GP +MP
-        a.btn.btn-default(@click='addOneLevel()') +1 Level
-        a.btn.btn-default(@click='addQuestProgress()' tooltip="+1000 to boss quests. 300 items to collection quests") Quest Progress Up
-        a.btn.btn-default(@click='makeAdmin()') Make Admin
-        a.btn.btn-default(@click='openModifyInventoryModal()') Modify Inventory
 </template>
 
-<style scoped>
+<style lang="scss" scoped>
   footer {
     background-color: #e1e0e3;
     height: 376px;
@@ -133,6 +136,17 @@
     background-color: #c3c0c7;
     display: inline-block;
     margin-right: 1em;
+
+    .social-icon {
+      color: #e1e0e3;
+      width: 16px;
+      margin: 0 auto;
+      margin-top: 1em;
+    }
+
+    .svg-icon.facebook svg {
+      height: 20px;
+    }
   }
 
   .logo.svg-icon {
@@ -140,17 +154,29 @@
     margin: 0 auto;
     color: #c3c0c7;
   }
+
+  .debug-group {
+    position: absolute;
+    background: #fff;
+    top: -300px;
+    border-radius: 2px;
+    padding: 2em;
+  }
 </style>
 
 <script>
 import axios from 'axios';
 import moment from 'moment';
 import { mapState } from 'client/libs/store';
+
 import gryphon from 'assets/svg/gryphon.svg';
+import twitter from 'assets/svg/twitter.svg';
+import facebook from 'assets/svg/facebook.svg';
+import instagram from 'assets/svg/instagram.svg';
 
 import modifyInventory from './modifyInventory';
 
-// const IS_PRODUCTION = process.env.NODE_ENV === 'production'; // eslint-disable-line no-process-env
+const IS_PRODUCTION = process.env.NODE_ENV === 'production'; // eslint-disable-line no-process-env
 
 export default {
   components: {
@@ -160,7 +186,12 @@ export default {
     return {
       icons: Object.freeze({
         gryphon,
+        twitter,
+        facebook,
+        instagram,
       }),
+      debugMenuShown: false,
+      IS_PRODUCTION,
     };
   },
   computed: {
@@ -190,7 +221,6 @@ export default {
       // @TODO: Sync user?
     },
     async addTenGems () {
-      // @TODO: User.addTenGems();
       await axios.post('/api/v3/debug/add-ten-gems');
       // @TODO: Notification.text('+10 Gems!');
       this.user.balance += 2.5;
diff --git a/website/client/components/auth/registerLogin.vue b/website/client/components/auth/registerLogin.vue
index f242ba3bcc..edca356e5b 100644
--- a/website/client/components/auth/registerLogin.vue
+++ b/website/client/components/auth/registerLogin.vue
@@ -34,10 +34,11 @@
     .text-center
       .btn.btn-info(@click='register()', v-if='registering', v-once) {{$t('joinHabitica')}}
       .btn.btn-info(@click='login()', v-if='!registering', v-once) {{$t('login')}}
-      router-link(tag="li", :to="{name: 'login'}", v-if='registering', exact)
-        a(v-once) {{ $t('login') }}
-      router-link(tag="li", :to="{name: 'register'}",  v-if='!registering', exact)
-        a(v-once) {{ $t('joinHabitica') }}
+      .toggle-links
+        router-link(:to="{name: 'login'}", v-if='registering', exact)
+          a.toggle-link(v-once) {{ $t('login') }}
+        router-link(:to="{name: 'register'}",  v-if='!registering', exact)
+          a.toggle-link(v-once) Don't have an account? Join Habitica!
 
   #bottom-background
     .seamless_mountains_demo_repeat
@@ -51,11 +52,24 @@
     background-color: $purple-200;
   }
 
+  ::-webkit-input-placeholder { /* Chrome/Opera/Safari */
+    color: $purple-400;
+  }
+  ::-moz-placeholder { /* Firefox 19+ */
+    color: $purple-400;
+  }
+  :-ms-input-placeholder { /* IE 10+ */
+    color: $purple-400;
+  }
+  :-moz-placeholder { /* Firefox 18- */
+    color: $purple-400;
+  }
+
   #login-form {
     margin: 0 auto;
     width: 40em;
     padding-top: 5em;
-    padding-bottom: 22.5em;
+    padding-bottom: 4em;
     position: relative;
     z-index: 1;
 
@@ -83,20 +97,7 @@
       background-color: #432874;
       border-color: transparent;
       height: 50px;
-      color: $purple-400;
-
-      ::-webkit-input-placeholder { /* Chrome/Opera/Safari */
-        color: $purple-400;
-      }
-      ::-moz-placeholder { /* Firefox 19+ */
-        color: $purple-400;
-      }
-      :-ms-input-placeholder { /* IE 10+ */
-        color: $purple-400;
-      }
-      :-moz-placeholder { /* Firefox 18- */
-        color: $purple-400;
-      }
+      color: $white;
     }
 
     .form-text {
@@ -123,7 +124,7 @@
       background-repeat: repeat-x;
       position: absolute;
       height: 500px;
-      width: 1600px;
+      width: 1517px;
     }
   }
 
@@ -133,7 +134,7 @@
     .seamless_mountains_demo_repeat {
       background-image: url('~assets/images/auth/seamless_mountains_demo.png');
       background-repeat: repeat-x;
-      width: 1600px;
+      width: 1517px;
       height: 500px;
       position: absolute;
       z-index: 0;
@@ -147,6 +148,14 @@
       height: 150px;
     }
   }
+
+  .toggle-links {
+    margin-top: 1em;
+  }
+
+  .toggle-link {
+    color: #fff !important;
+  }
 </style>
 
 <script>
@@ -215,7 +224,7 @@ export default {
         passwordConfirm: this.passwordConfirm,
       });
 
-      this.$router.push('/tasks');
+      window.location.href = '/';
     },
     async login () {
       await this.$store.dispatch('auth:login', {
@@ -224,7 +233,7 @@ export default {
         password: this.password,
       });
 
-      this.$router.push('/tasks');
+      window.location.href = '/';
     },
     async socialAuth (network) {
       let auth = await hello(network).login({scope: 'email'});
@@ -233,7 +242,7 @@ export default {
         auth,
       });
 
-      this.$router.push('/tasks');
+      window.location.href = '/';
     },
   },
 };
diff --git a/website/client/components/challenges/challengeDetail.vue b/website/client/components/challenges/challengeDetail.vue
index 74bf6b8ea2..b4ab9cfc0c 100644
--- a/website/client/components/challenges/challengeDetail.vue
+++ b/website/client/components/challenges/challengeDetail.vue
@@ -1,7 +1,7 @@
 <template lang="pug">
 .row
   challenge-modal(:challenge='challenge', v-on:updatedChallenge='updatedChallenge')
-  close-challenge-modal
+  close-challenge-modal(:members='members', :challengeId='challenge._id')
 
   .col-8.standard-page
     .row
@@ -39,10 +39,9 @@
       div(v-if='isMember')
         button.btn.btn-danger(v-once, @click='leaveChallenge()') {{$t('leaveChallenge')}}
       div(v-if='isLeader')
-        b-dropdown(:text="$t('create')")
+        b-dropdown.create-dropdown(:text="$t('create')")
           b-dropdown-item(v-for="type in columns", :key="type", @click="createTask(type)")
             | {{$t(type)}}
-        //- button.btn.btn-success(v-once) {{$t('addTask')}}
         task-modal(
           :task="workingTask",
           :purpose="taskFormPurpose",
@@ -129,6 +128,7 @@
     div, button {
       width: 60%;
       margin: 0 auto;
+      margin-bottom: .5em;
       text-align: center;
     }
   }
@@ -138,6 +138,14 @@
   }
 </style>
 
+<style>
+  .create-dropdown button {
+    width: 100%;
+    font-size: 16px !important;
+    font-weight: bold !important;
+  }
+</style>
+
 <script>
 import Vue from 'vue';
 import bDropdown from 'bootstrap-vue/lib/components/dropdown';
@@ -220,7 +228,7 @@ export default {
     createTask (type) {
       this.taskFormPurpose = 'create';
       this.creatingTask = taskDefaults({type, text: ''});
-      this.workingTask = this.editingTask;
+      this.workingTask = this.creatingTask;
       // Necessary otherwise the first time the modal is not rendered
       Vue.nextTick(() => {
         this.$root.$emit('show::modal', 'task-modal');
@@ -240,6 +248,7 @@ export default {
       this.tasksByType[task.type].splice(index, 1, task);
     },
     showMemberModal () {
+      this.$store.state.groupId = 'challenge'; // @TODO: change these terrible settings
       this.$store.state.viewingMembers = this.members;
       this.$root.$emit('show::modal', 'members-modal');
     },
diff --git a/website/client/components/challenges/challengeItem.vue b/website/client/components/challenges/challengeItem.vue
index ab4f5f6de2..b00dd87da0 100644
--- a/website/client/components/challenges/challengeItem.vue
+++ b/website/client/components/challenges/challengeItem.vue
@@ -106,6 +106,7 @@
       color: $gray-200;
       margin-top: 2em;
       margin-bottom: 2em;
+      overflow: hidden;
     }
 
     .well-wrapper {
diff --git a/website/client/components/challenges/challengeModal.vue b/website/client/components/challenges/challengeModal.vue
index e9021dfae4..be22b58a9a 100644
--- a/website/client/components/challenges/challengeModal.vue
+++ b/website/client/components/challenges/challengeModal.vue
@@ -8,7 +8,7 @@
       .form-group
         label
           strong(v-once) {{$t('shortName')}}*
-        b-form-input(type="text", :placeholder="$t('challengeNamePlaceHolder')", v-model="workingChallenge.shortName")
+        b-form-input(type="text", :placeholder="$t('shortNamePlaceholder')", v-model="workingChallenge.shortName")
       .form-group
         label
           strong(v-once) {{$t('description')}}*
@@ -110,7 +110,8 @@
     }
 
     .category-box {
-      top: -40px !important;
+      top: -120px !important;
+      z-index: 10;
     }
   }
 </style>
@@ -134,49 +135,101 @@ export default {
   },
   data () {
     let categoryOptions = [
+      {
+        label: 'Habitica Official',
+        key: 'habitica_official',
+      },
+      {
+        label: 'Academic',
+        key: 'academic',
+      },
+      {
+        label: 'Accountability',
+        key: 'accountability',
+      },
+      {
+        label: 'Advocacy & Causes',
+        key: 'advocacy_causes',
+      },
       {
         label: 'animals',
         key: 'animals',
       },
       {
-        label: 'artDesign',
-        key: 'art_design',
+        label: 'Creativity',
+        key: 'creativity',
       },
       {
-        label: 'booksWriting',
-        key: 'books_writing',
+        label: 'Entertainment & Fandom',
+        key: 'entertainment_fandom',
       },
       {
-        label: 'comicsHobbies',
-        key: 'comics_hobbies',
+        label: 'Finance',
+        key: 'finance',
       },
       {
-        label: 'diyCrafts',
-        key: 'diy_crafts',
-      },
-      {
-        label: 'education',
-        key: 'education',
-      },
-      {
-        label: 'foodCooking',
+        label: 'Food & Cooking',
         key: 'food_cooking',
       },
       {
-        label: 'healthFitness',
+        label: 'Games & Gaming',
+        key: 'games_gaming',
+      },
+      {
+        label: 'Health + Fitness',
         key: 'health_fitness',
       },
       {
-        label: 'music',
-        key: 'music',
+        label: 'Hobbies',
+        key: 'hobbies',
       },
       {
-        label: 'relationship',
-        key: 'relationship',
+        label: 'Language & Literature',
+        key: 'language_literature',
       },
       {
-        label: 'scienceTech',
-        key: 'science_tech ',
+        label: 'Location-based',
+        key: 'location_based',
+      },
+      {
+        label: 'Mental Health',
+        key: 'mental_health ',
+      },
+      {
+        label: 'Occupations',
+        key: 'occupations ',
+      },
+      {
+        label: 'Online Communities',
+        key: 'online_communities ',
+      },
+      {
+        label: 'Getting Organized',
+        key: 'getting_organized ',
+      },
+      {
+        label: 'Recovery',
+        key: 'recovery ',
+      },
+      {
+        label: 'Role-Play',
+        key: 'role_play ',
+      },
+      {
+        label: 'Self-Care',
+        key: 'self_care ',
+      },
+      {
+        label: 'Self-Improvement',
+        key: 'self_improvement ',
+      },
+      {
+        label: 'Spirituality',
+        key: 'spirituality ',
+      },
+      {
+        label: 'Time-Management',
+        key: 'time_management',
       },
     ];
     let hashedCategories = {};
@@ -205,11 +258,13 @@ export default {
     });
 
     this.groups = await this.$store.dispatch('guilds:getMyGuilds');
-    let party = await this.$store.dispatch('guilds:getGroup', {groupId: 'party'});
-    this.groups.push({
-      name: party.name,
-      _id: party._id,
-    });
+    if (this.user.party._id) {
+      let party = await this.$store.dispatch('guilds:getGroup', {groupId: 'party'});
+      this.groups.push({
+        name: party.name,
+        _id: party._id,
+      });
+    }
 
     this.groups.push({
       name: 'Public',
diff --git a/website/client/components/challenges/closeChallengeModal.vue b/website/client/components/challenges/closeChallengeModal.vue
index b53e6ec3e1..4da8a04b15 100644
--- a/website/client/components/challenges/closeChallengeModal.vue
+++ b/website/client/components/challenges/closeChallengeModal.vue
@@ -10,11 +10,10 @@ div
       .col-12
         strong(v-once) {{$t('selectChallengeWinnersDescription')}}
       .col-12
-        b-dropdown(:text="$t('sort')", right=true)
-          b-dropdown-item(@click='sort(option.value)')
-            | Member
+        select.form-control(v-model='winnerId')
+          option(v-for='member in members', :value='member._id') {{member.profile.name}}
       .col-12
-        button.btn.btn-primary(v-once) {{$t('awardWinners')}}
+        button.btn.btn-primary(v-once, @click='closeChallenge') {{$t('awardWinners')}}
       .col-12
         hr
         .or {{$t('or')}}
@@ -78,26 +77,29 @@ import bDropdown from 'bootstrap-vue/lib/components/dropdown';
 import bDropdownItem from 'bootstrap-vue/lib/components/dropdown-item';
 
 export default {
-  props: ['challenge'],
+  props: ['challengeId', 'members'],
   components: {
     bModal,
     bDropdown,
     bDropdownItem,
   },
-
   data () {
     return {
+      winnerId: '',
     };
   },
   methods: {
-    closeChallenge () {
-      // this.challenge = this.$store.dispatch('challenges:selectChallengeWinner', {
-      //   challengeId: this.challengeId,
-      //   winnerId: this.winnerId,
-      // });
+    async closeChallenge () {
+      this.challenge = await this.$store.dispatch('challenges:selectChallengeWinner', {
+        challengeId: this.challengeId,
+        winnerId: this.winnerId,
+      });
+      this.$router.push('/challenges/myChallenges');
     },
-    deleteChallenge () {
-      // this.challenge = this.$store.dispatch('challenges:deleteChallenge', {challengeId: this.challengeId});
+    async deleteChallenge () {
+      if (!confirm('Are you sure you want to delete this challenge?')) return;
+      this.challenge = await this.$store.dispatch('challenges:deleteChallenge', {challengeId: this.challengeId});
+      this.$router.push('/challenges/myChallenges');
     },
   },
 };
diff --git a/website/client/components/challenges/findChallenges.vue b/website/client/components/challenges/findChallenges.vue
index bf6ddb2588..508f60589d 100644
--- a/website/client/components/challenges/findChallenges.vue
+++ b/website/client/components/challenges/findChallenges.vue
@@ -1,6 +1,6 @@
 <template lang="pug">
 .row
-  challenge-modal
+  challenge-modal(v-on:createChallenge='challengeCreated')
   sidebar(v-on:search="updateSearch", v-on:filter="updateFilters")
 
   .col-10.standard-page
@@ -127,6 +127,9 @@ export default {
     async loadchallanges () {
       this.challenges = await this.$store.dispatch('challenges:getUserChallenges');
     },
+    challengeCreated (challenge) {
+      this.challenges.push(challenge);
+    },
   },
 };
 </script>
diff --git a/website/client/components/challenges/groupChallenges.vue b/website/client/components/challenges/groupChallenges.vue
index f0533b0892..2102ef8ceb 100644
--- a/website/client/components/challenges/groupChallenges.vue
+++ b/website/client/components/challenges/groupChallenges.vue
@@ -7,7 +7,7 @@ div
       h4(v-once) {{ $t('haveNoChallenges') }}
       p(v-once) {{ $t('challengeDescription') }}
       button.btn.btn-secondary(v-once, @click='createChallenge()') {{ $t('createChallenge') }}
-  router-link.title(:to="{ name: 'challenge', params: { challengeId: challenge._id } }", v-for='challenge in challenges')
+  router-link.title(:to="{ name: 'challenge', params: { challengeId: challenge._id } }", v-for='challenge in challenges',:key='challenge._id')
     .col-12.challenge-item
       .row
         .col-9
@@ -26,7 +26,7 @@ div
     button.btn.btn-secondary(@click='createChallenge()') {{ $t('createChallenge') }}
 </template>
 
-<style>
+<style scoped>
   .title {
     color: #4E4A57;
   }
diff --git a/website/client/components/challenges/myChallenges.vue b/website/client/components/challenges/myChallenges.vue
index 6f01251623..2a6e176b61 100644
--- a/website/client/components/challenges/myChallenges.vue
+++ b/website/client/components/challenges/myChallenges.vue
@@ -1,6 +1,6 @@
 <template lang="pug">
 .row
-  challenge-modal
+  challenge-modal(v-on:createChallenge='challengeCreated')
   sidebar(v-on:search="updateSearch", v-on:filter="updateFilters")
 
   .col-10.standard-page
@@ -151,6 +151,9 @@ export default {
     async loadchallanges () {
       this.challenges = await this.$store.dispatch('challenges:getUserChallenges');
     },
+    challengeCreated (challenge) {
+      this.challenges.push(challenge);
+    },
   },
 };
 </script>
diff --git a/website/client/components/challenges/sidebar.vue b/website/client/components/challenges/sidebar.vue
index a3c0aeaf2f..a67d2992e7 100644
--- a/website/client/components/challenges/sidebar.vue
+++ b/website/client/components/challenges/sidebar.vue
@@ -46,24 +46,100 @@ export default {
       categoryFilters: [],
       categoryOptions: [
         {
-          label: 'habiticaOfficial',
-          key: 'official',
+          label: 'Habitica Official',
+          key: 'habitica_official',
+        },
+        {
+          label: 'Academic',
+          key: 'academic',
+        },
+        {
+          label: 'Accountability',
+          key: 'accountability',
+        },
+        {
+          label: 'Advocacy & Causes',
+          key: 'advocacy_causes',
         },
         {
           label: 'animals',
           key: 'animals',
         },
         {
-          label: 'artDesign',
-          key: 'art_design',
+          label: 'Creativity',
+          key: 'creativity',
         },
         {
-          label: 'booksWriting',
-          key: 'books_writing',
+          label: 'Entertainment & Fandom',
+          key: 'entertainment_fandom',
         },
         {
-          label: 'comicsHobbies',
-          key: 'comics_hobbies',
+          label: 'Finance',
+          key: 'finance',
+        },
+        {
+          label: 'Food & Cooking',
+          key: 'food_cooking',
+        },
+        {
+          label: 'Games & Gaming',
+          key: 'games_gaming',
+        },
+        {
+          label: 'Health + Fitness',
+          key: 'health_fitness',
+        },
+        {
+          label: 'Hobbies',
+          key: 'hobbies',
+        },
+        {
+          label: 'Language & Literature',
+          key: 'language_literature',
+        },
+        {
+          label: 'Location-based',
+          key: 'location_based',
+        },
+        {
+          label: 'Mental Health',
+          key: 'mental_health ',
+        },
+        {
+          label: 'Occupations',
+          key: 'occupations ',
+        },
+        {
+          label: 'Online Communities',
+          key: 'online_communities ',
+        },
+        {
+          label: 'Getting Organized',
+          key: 'getting_organized ',
+        },
+        {
+          label: 'Recovery',
+          key: 'recovery ',
+        },
+        {
+          label: 'Role-Play',
+          key: 'role_play ',
+        },
+        {
+          label: 'Self-Care',
+          key: 'self_care ',
+        },
+        {
+          label: 'Self-Improvement',
+          key: 'self_improvement ',
+        },
+        {
+          label: 'Spirituality',
+          key: 'spirituality ',
+        },
+        {
+          label: 'Time-Management',
+          key: 'time_management',
         },
       ],
       roleFilters: [],
diff --git a/website/client/components/chat/autoComplete.vue b/website/client/components/chat/autoComplete.vue
index 07a4cc094e..e953d81bbd 100644
--- a/website/client/components/chat/autoComplete.vue
+++ b/website/client/components/chat/autoComplete.vue
@@ -1,28 +1,38 @@
 <template lang="pug">
-div.autocomplete-selection
-  div(v-for='result in searchResults', @click='select(result)') {{ result }}
+div.autocomplete-selection(v-if='searchResults.length > 0', :style='autocompleteStyle')
+  .autocomplete-results(v-for='result in searchResults', @click='select(result)') {{ result }}
 </template>
 
 <style scoped>
-
+  .autocomplete-results {
+    padding: .5em;
+    box-shadow: 1px 1px 1px #efefef;
+  }
 </style>
 
 <script>
 export default {
-  props: ['selections', 'text'],
+  props: ['selections', 'text', 'coords', 'groupId'],
   data () {
     return {
       currentSearch: '',
       searchActive: false,
       currentSearchPosition: 0,
-      // @TODO: HAve this passed
-      tmpSelections: [
-        'TheHollidayInn',
-        'Paglias',
-      ],
+      tmpSelections: [],
     };
   },
   computed: {
+    autocompleteStyle () {
+      return {
+        top: `${this.coords.TOP + 30}px`,
+        left: `${this.coords.LEFT + 30}px`,
+        position: 'absolute',
+        minWidth: '100px',
+        minHeight: '100px',
+        zIndex: 100,
+        backgroundColor: 'white',
+      };
+    },
     searchResults () {
       if (!this.searchActive) return [];
       let currentSearch = this.text.substring(this.currentSearchPosition + 1, this.text.length);
@@ -37,23 +47,13 @@ export default {
       this.searchActive = true;
       this.currentSearchPosition = newText.length - 1;
     },
-    // @TODO: implement position
-    // caretChanged = function(newCaretPos) {
-    //   var relativeelement = $('.chat-form div:first');
-    //   var textarea = $('.chat-form textarea');
-    //   var userlist = $('.list-at-user');
-    //   var offset = {
-    //     x: textarea.offset().left - relativeelement.offset().left,
-    //     y: textarea.offset().top - relativeelement.offset().top,
-    //   };
-    //   if(relativeelement) {
-    //     var caretOffset = InputCaret.getPosition(textarea);
-    //     userlist.css({
-    //               left: caretOffset.left + offset.x,
-    //               top: caretOffset.top + offset.y + 16
-    //             });
-    //   }
-    // }
+    async groupId () {
+      if (!this.groupId) return;
+      let members = await this.$store.dispatch('members:getGroupMembers', {groupId: this.groupId});
+      this.tmpSelections = members.map((member) => {
+        return member.profile.name;
+      });
+    },
   },
   methods: {
     select (result) {
diff --git a/website/client/components/chat/chatMessages.vue b/website/client/components/chat/chatMessages.vue
index 60b1037b7c..af6149905b 100644
--- a/website/client/components/chat/chatMessages.vue
+++ b/website/client/components/chat/chatMessages.vue
@@ -17,7 +17,7 @@ div
         .card-block
           h3.leader {{msg.user}}
           p {{msg.timestamp | timeAgo}}
-          .text {{msg.text}}
+          .text(v-markdown='msg.text')
           hr
           .action(@click='like(msg, index)', v-if='msg.likes', :class='{active: msg.likes[user._id]}')
             .svg-icon(v-html="icons.like")
@@ -97,6 +97,7 @@ div
 import moment from 'moment';
 import cloneDeep from 'lodash/cloneDeep';
 import { mapState } from 'client/libs/store';
+import markdownDirective from 'client/directives/markdown';
 
 import copyAsTodoModal from './copyAsTodoModal';
 import reportFlagModal from './reportFlagModal';
@@ -113,6 +114,9 @@ export default {
     copyAsTodoModal,
     reportFlagModal,
   },
+  directives: {
+    markdown: markdownDirective,
+  },
   data () {
     return {
       icons: Object.freeze({
diff --git a/website/client/components/chat/copyAsTodoModal.vue b/website/client/components/chat/copyAsTodoModal.vue
index 57e571a382..0c464350fc 100644
--- a/website/client/components/chat/copyAsTodoModal.vue
+++ b/website/client/components/chat/copyAsTodoModal.vue
@@ -17,7 +17,7 @@
               | &nbsp;
 
         div.task-text
-          markdown(text='text',target='_blank')
+          div(v-markdown='text', target='_blank')
 
     .modal-footer
       button.btn.btn-default(@click='close()') {{ $t('close') }}
@@ -26,11 +26,15 @@
 
 <script>
 import bModal from 'bootstrap-vue/lib/components/modal';
+import markdownDirective from 'client/directives/markdown';
 
 export default {
   components: {
     bModal,
   },
+  directives: {
+    markdown: markdownDirective,
+  },
   props: ['copyingMessage', 'groupName', 'groupId'],
   data () {
     return {
diff --git a/website/client/components/chat/reportFlagModal.vue b/website/client/components/chat/reportFlagModal.vue
index 2d3711933f..d56875c475 100644
--- a/website/client/components/chat/reportFlagModal.vue
+++ b/website/client/components/chat/reportFlagModal.vue
@@ -4,7 +4,7 @@
       h4(v-html="$t('abuseFlagModalHeading', reportData)")
     .modal-body
       blockquote
-        // @TODO: markdown(text='abuseObject.text')
+        div(v-markdown='abuseObject.text')
       p(v-html="$t('abuseFlagModalBody', abuseFlagModalBody)")
     .modal-footer
       button.pull-left.btn.btn-danger(@click='clearFlagCount()', v-if='user.contributor.admin && abuseObject.flagCount > 0')
@@ -17,12 +17,16 @@
 import bModal from 'bootstrap-vue/lib/components/modal';
 import { mapState } from 'client/libs/store';
 import notifications from 'client/mixins/notifications';
+import markdownDirective from 'client/directives/markdown';
 
 export default {
   mixins: [notifications],
   components: {
     bModal,
   },
+  directives: {
+    markdown: markdownDirective,
+  },
   computed: {
     ...mapState({user: 'user.data'}),
     reportData () {
diff --git a/website/client/components/creatorIntro.vue b/website/client/components/creatorIntro.vue
index ab2dc0de1b..89a47705fd 100644
--- a/website/client/components/creatorIntro.vue
+++ b/website/client/components/creatorIntro.vue
@@ -434,6 +434,7 @@ import { mapState } from 'client/libs/store';
 import avatar from './avatar';
 import { getBackgroundShopSets } from '../../common/script/libs/shops';
 import unlock from '../../common/script/ops/unlock';
+import guide from 'client/mixins/guide';
 
 import bModal from 'bootstrap-vue/lib/components/modal';
 
@@ -445,6 +446,7 @@ import hairIcon from 'assets/svg/hair.svg';
 import backgroundsIcon from 'assets/svg/backgrounds.svg';
 
 export default {
+  mixins: [guide],
   components: {
     avatar,
     bModal,
@@ -518,6 +520,15 @@ export default {
     done () {
       this.$root.$emit('hide::modal', 'avatar-modal');
       this.$router.push('/');
+      this.$store.dispatch('user:set', {
+        'flags.welcomed': true,
+      });
+
+      // @TODO: This is a timeout to ensure dom is loaded
+      window.setTimeout(() => {
+        this.initTour();
+        this.goto('intro', 0);
+      }, 1000);
     },
     showPlainBackgroundBlurb (identifier, set) {
       return identifier === 'incentiveBackgrounds' && !this.ownsSet('background', set);
diff --git a/website/client/components/groups/discovery.vue b/website/client/components/groups/discovery.vue
index b1a547cb11..4d4b118419 100644
--- a/website/client/components/groups/discovery.vue
+++ b/website/client/components/groups/discovery.vue
@@ -26,7 +26,9 @@
           span(v-once) {{ $t('loading') }}
 </template>
 
-<style scoped>
+<style lang="scss" scoped>
+  @import '~client/assets/scss/colors.scss';
+  
   .sort-select {
     margin: 2em;
   }
diff --git a/website/client/components/groups/guild.vue b/website/client/components/groups/guild.vue
index 6a1483eec3..081e871a61 100644
--- a/website/client/components/groups/guild.vue
+++ b/website/client/components/groups/guild.vue
@@ -25,7 +25,8 @@
       .col-12
         h3(v-once) {{ $t('chat') }}
 
-        textarea(:placeholder="$t('chatPlaceHolder')", v-model='newMessage')
+        textarea(:placeholder="!isParty ? $t('chatPlaceHolder') : $t('partyChatPlaceholder')", v-model='newMessage', @keydown='updateCarretPosition')
+        autocomplete(:text='newMessage', v-on:select="selectedAutocomplete", :coords='coords', :groupId='groupId')
         button.btn.btn-secondary.send-chat.float-right(v-once, @click='sendMessage()') {{ $t('send') }}
         button.btn.btn-secondary.float-left(v-once, @click='fetchRecentMessages()') {{ $t('fetchRecentMessages') }}
 
@@ -87,7 +88,7 @@
                 .col-6
                   h4.float-left(v-once) {{ questData.boss.name() }}
                 .col-6
-                  span.float-right(v-once) {{ $t('participants') }}
+                  span.float-right(v-once) {{ $t('participantsTitle') }}
               .row
                 .col-12
                   .grey-progress-bar
@@ -95,9 +96,9 @@
               .row.boss-details
                   .col-6
                     span.float-left
-                      | {{group.quest.progress.hp}} / {{questData.boss.hp}}
+                      | {{parseFloat(group.quest.progress.hp).toFixed(2)}} / {{parseFloat(questData.boss.hp).toFixed(2)}}
                   .col-6
-                    span.float-right 30 pending damage
+                    span.float-right {{group.quest.progress.up || 0}} pending damage
             button.btn.btn-secondary(v-once, @click="questAbort()") {{ $t('abort') }}
 
     .section-header
@@ -211,12 +212,24 @@
     background-color: $white;
     border: solid 1px $gray-400;
     font-size: 16px;
-    font-style: italic;
     line-height: 1.43;
     color: $gray-300;
     padding: .5em;
   }
 
+  textarea::-webkit-input-placeholder { /* Chrome/Opera/Safari */
+    font-style: italic;
+  }
+  textarea::-moz-placeholder { /* Firefox 19+ */
+    font-style: italic;
+  }
+  textarea:-ms-input-placeholder { /* IE 10+ */
+    font-style: italic;
+  }
+  textarea:-moz-placeholder { /* Firefox 18- */
+    font-style: italic;
+  }
+
   .title-details {
     padding-top: 1em;
     padding-left: 1em;
@@ -284,7 +297,8 @@
     }
 
     .tooltip-wrapper {
-      margin-left: 2.2em;
+      width: 15px;
+      margin-left: 1.2em;
     }
   }
 
@@ -359,6 +373,7 @@ import percent from 'common/script/libs/percent';
 import groupFormModal from './groupFormModal';
 import inviteModal from './inviteModal';
 import chatMessage from '../chat/chatMessages';
+import autocomplete from '../chat/autoComplete';
 import groupChallenges from '../challenges/groupChallenges';
 
 import bCollapse from 'bootstrap-vue/lib/components/collapse';
@@ -392,6 +407,7 @@ export default {
     chatMessage,
     inviteModal,
     groupChallenges,
+    autocomplete,
   },
   directives: {
     bToggle,
@@ -422,6 +438,10 @@ export default {
         challenges: true,
       },
       newMessage: '',
+      coords: {
+        TOP: 0,
+        LEFT: 0,
+      },
     };
   },
   computed: {
@@ -515,6 +535,36 @@ export default {
     },
   },
   methods: {
+    // @TODO: abstract autocomplete
+    // https://medium.com/@_jh3y/how-to-where-s-the-caret-getting-the-xy-position-of-the-caret-a24ba372990a
+    getCoord (e, text) {
+      let carPos = text.selectionEnd;
+      let div = document.createElement('div');
+      let span = document.createElement('span');
+      let copyStyle = getComputedStyle(text);
+
+      [].forEach.call(copyStyle, (prop) => {
+        div.style[prop] = copyStyle[prop];
+      });
+
+      div.style.position = 'absolute';
+      document.body.appendChild(div);
+      div.textContent = text.value.substr(0, carPos);
+      span.textContent = text.value.substr(carPos) || '.';
+      div.appendChild(span);
+      this.coords = {
+        TOP: span.offsetTop,
+        LEFT: span.offsetLeft,
+      };
+      document.body.removeChild(div);
+    },
+    updateCarretPosition (eventUpdate) {
+      let text = eventUpdate.target;
+      this.getCoord(eventUpdate, text);
+    },
+    selectedAutocomplete (newText) {
+      this.newMessage = newText;
+    },
     showMemberModal () {
       this.$store.state.groupId = this.group._id;
       this.$root.$emit('show::modal', 'members-modal');
diff --git a/website/client/components/groups/membersModal.vue b/website/client/components/groups/membersModal.vue
index a417c704f7..5e3d70cbb6 100644
--- a/website/client/components/groups/membersModal.vue
+++ b/website/client/components/groups/membersModal.vue
@@ -160,13 +160,15 @@ export default {
   methods: {
     async getMembers () {
       let groupId = this.$store.state.groupId || this.group._id;
-      if (groupId) {
+      if (groupId && groupId !== 'challenge') {
         let members = await this.$store.dispatch('members:getGroupMembers', {
           groupId,
           includeAllPublicFields: true,
         });
         this.members = members;
-      } else if (this.$store.state.viewingMembers.length > 1) {
+      }
+
+      if (this.$store.state.viewingMembers.length > 0) {
         this.members = this.$store.state.viewingMembers;
       }
     },
diff --git a/website/client/components/groups/publicGuildItem.vue b/website/client/components/groups/publicGuildItem.vue
index f617f3d350..2505447d26 100644
--- a/website/client/components/groups/publicGuildItem.vue
+++ b/website/client/components/groups/publicGuildItem.vue
@@ -4,7 +4,9 @@ router-link.card-link(:to="{ name: 'guild', params: { groupId: guild._id } }")
     .card-block
       .row
         .col-md-2
-          .svg-icon.shield(v-html="icons.goldGuildBadge")
+          .svg-icon.shield(v-html="icons.goldGuildBadge", v-if='guild.memberCount > 1000')
+          .svg-icon.shield(v-html="icons.silverGuildBadgeIcon", v-if='guild.memberCount > 100 && guild.memberCount < 999')
+          .svg-icon.shield(v-html="icons.bronzeGuildBadgeIcon", v-if='guild.memberCount < 100')
           .member-count {{guild.memberCount}}
         .col-md-10
           .row
@@ -111,6 +113,8 @@ import groupUtilities from 'client/mixins/groupsUtilities';
 import findIndex from 'lodash/findIndex';
 import gemIcon from 'assets/svg/gem.svg';
 import goldGuildBadgeIcon from 'assets/svg/gold-guild-badge.svg';
+import silverGuildBadgeIcon from 'assets/svg/silver-guild-badge.svg';
+import bronzeGuildBadgeIcon from 'assets/svg/bronze-guild-badge.svg';
 
 export default {
   mixins: [groupUtilities],
@@ -126,6 +130,8 @@ export default {
       icons: Object.freeze({
         gem: gemIcon,
         goldGuildBadge: goldGuildBadgeIcon,
+        silverGuildBadgeIcon,
+        bronzeGuildBadgeIcon,
       }),
     };
   },
diff --git a/website/client/components/groups/tavern.vue b/website/client/components/groups/tavern.vue
index a1452213b3..c7ed03b4f9 100644
--- a/website/client/components/groups/tavern.vue
+++ b/website/client/components/groups/tavern.vue
@@ -7,11 +7,11 @@
 
     .row.chat-row
       .col-12
-        h3(v-once) {{ $t('welcomeToTavern') }}
+        h3(v-once) {{ $t('tavernChat') }}
 
         .row
-          textarea(placeholder="Type a message to Habiticans here", v-model='newMessage')
-          autocomplete(:text='newMessage', v-on:select="selectedAutocomplete")
+          textarea(placeholder="Type a message to Habiticans here", v-model='newMessage', @keydown='updateCarretPosition')
+          autocomplete(:text='newMessage', v-on:select="selectedAutocomplete", :coords='coords', :groupId='groupId')
           button.btn.btn-secondary.send-chat.float-right(v-once, @click='sendMessage()') {{ $t('send') }}
 
         .row.community-guidelines(v-if='!communityGuidelinesAccepted')
@@ -50,6 +50,7 @@
           .col-3.staff(v-for='user in staff', :class='{staff: user.type === "Staff", moderator: user.type === "Moderator", bailey: user.name === "It\'s Bailey"}')
             .title {{user.name}}
             .type {{user.type}}
+            .svg-icon(v-html="icons.tierChampionIcon")
 
       .section-header
         .row
@@ -194,7 +195,7 @@
   }
 
   .grassy-meadow-backdrop {
-    background-image: url('~assets/images/groups/grassy-meadow-backdrop.png');
+    background-image: url('~assets/images/tavern_backdrop_web.png');
     width: 100%;
     height: 246px;
   }
@@ -296,6 +297,17 @@ import questBackground from 'assets/svg/quest-background-border.svg';
 import upIcon from 'assets/svg/up.svg';
 import downIcon from 'assets/svg/down.svg';
 
+import tierChampionIcon from 'assets/svg/tier-champion-icon.svg';
+import tierChampion2Icon from 'assets/svg/tier-champion-2-icon.svg';
+import tierEliteIcon from 'assets/svg/tier-elite-icon.svg';
+import tierElite2Icon from 'assets/svg/tier-elite-2-icon.svg';
+import tierFriendIcon from 'assets/svg/tier-friend-icon.svg';
+import tierFriend2Icon from 'assets/svg/tier-friend-2-icon.svg';
+import tierLegendaryIcon from 'assets/svg/tier-legendary-icon.svg';
+import tierModIcon from 'assets/svg/tier-mod-icon.svg';
+import tierNPCIcon from 'assets/svg/tier-npc-icon.svg';
+import tierStaffIcon from 'assets/svg/tier-staff-icon.svg';
+
 export default {
   components: {
     chatMessage,
@@ -303,7 +315,18 @@ export default {
   },
   data () {
     return {
+      groupId: TAVERN_ID,
       icons: Object.freeze({
+        tierStaffIcon,
+        tierNPCIcon,
+        tierModIcon,
+        tierLegendaryIcon,
+        tierFriend2Icon,
+        tierFriendIcon,
+        tierElite2Icon,
+        tierEliteIcon,
+        tierChampion2Icon,
+        tierChampionIcon,
         gem: gemIcon,
         questIcon,
         challengeIcon,
@@ -395,6 +418,10 @@ export default {
         },
       ],
       newMessage: '',
+      coords: {
+        TOP: 0,
+        LEFT: 0,
+      },
     };
   },
   computed: {
@@ -407,6 +434,32 @@ export default {
     this.group = await this.$store.dispatch('guilds:getGroup', {groupId: TAVERN_ID});
   },
   methods: {
+    // https://medium.com/@_jh3y/how-to-where-s-the-caret-getting-the-xy-position-of-the-caret-a24ba372990a
+    getCoord (e, text) {
+      let carPos = text.selectionEnd;
+      let div = document.createElement('div');
+      let span = document.createElement('span');
+      let copyStyle = getComputedStyle(text);
+
+      [].forEach.call(copyStyle, (prop) => {
+        div.style[prop] = copyStyle[prop];
+      });
+
+      div.style.position = 'absolute';
+      document.body.appendChild(div);
+      div.textContent = text.value.substr(0, carPos);
+      span.textContent = text.value.substr(carPos) || '.';
+      div.appendChild(span);
+      this.coords = {
+        TOP: span.offsetTop,
+        LEFT: span.offsetLeft,
+      };
+      document.body.removeChild(div);
+    },
+    updateCarretPosition (eventUpdate) {
+      let text = eventUpdate.target;
+      this.getCoord(eventUpdate, text);
+    },
     selectedAutocomplete (newText) {
       this.newMessage = newText;
     },
diff --git a/website/client/components/notifications.vue b/website/client/components/notifications.vue
index d11c074dcc..79073f4efd 100644
--- a/website/client/components/notifications.vue
+++ b/website/client/components/notifications.vue
@@ -1,6 +1,5 @@
 <template lang="pug">
 div
-  welcome-modal
   new-stuff
   death
   low-health
@@ -223,20 +222,22 @@ export default {
     },
   },
   async mounted () {
-    if (!this.user.flags.welcomed) {
-      this.$root.$emit('show::modal', 'welcome');
-    }
-
     Promise.all(['user.fetch', 'tasks.fetchUserTasks'])
       .then(() => {
+        if (!this.user.flags.welcomed) {
+          this.$store.state.avatarEditorOptions.editingUser = false;
+          this.$root.$emit('show::modal', 'avatar-modal');
+        }
+
+        // @TODO: This is a timeout to ensure dom is loaded
+        window.setTimeout(() => {
+          this.initTour();
+          if (this.user.flags.tour.intro === this.TOUR_END || !this.user.flags.welcomed) return;
+          this.goto('intro', 0);
+        }, 2000);
+
         this.runYesterDailies();
       });
-
-    window.setTimeout(() => {
-      this.initTour();
-      if (this.user.flags.tour.intro === this.TOUR_END) return;
-      this.goto('intro', 0);
-    }, 2000);
   },
   methods: {
     playSound () {
diff --git a/website/client/components/settings/deleteModal.vue b/website/client/components/settings/deleteModal.vue
index a711e90313..5c2bcb3c16 100644
--- a/website/client/components/settings/deleteModal.vue
+++ b/website/client/components/settings/deleteModal.vue
@@ -39,12 +39,14 @@ export default {
       this.$root.$emit('hide::modal', 'reset');
     },
     async deleteAccount () {
-      await axios.delete('/api/v3/user/', {
-        password: this.password,
-        feedback: this.feedback,
+      await axios.delete('/api/v3/user', {
+        data: {
+          password: this.password,
+          feedback: this.feedback,
+        },
       });
       localStorage.clear();
-      this.$router.push('/');
+      this.$router.push('/home');
       this.$root.$emit('hide::modal', 'reset');
     },
   },
diff --git a/website/client/components/static/faq.vue b/website/client/components/static/faq.vue
index 301b99426a..1b98bebf11 100644
--- a/website/client/components/static/faq.vue
+++ b/website/client/components/static/faq.vue
@@ -3,30 +3,54 @@
   .col-6.offset-3
     .page-header
       h1 {{ $t('frequentlyAskedQuestions') }}
-    p.pagemeta
-      | {{ $t('lastUpdated') }}
-      |&nbsp;
-      | {{ $t('January') }}
-      |&nbsp;5&comma; 2016
-    div(v-for='(heading, index) in headings')
+    .faq-question(v-for='(heading, index) in headings')
       h2.accordion(@click='setActivePage(heading)') {{ $t(`faqQuestion${index}`) }}
-      // @TODO: Markdown
-      div(v-if='activePage === heading', v-html="$t('webFaqAnswer' + index, replacements)")
-
+      div(v-if='pageState[heading]', v-markdown="$t('webFaqAnswer' + index, replacements)")
     hr
-    // @TODO markdown
-    div(v-html="$t('webFaqStillNeedHelp')")
+    div(v-markdown="$t('webFaqStillNeedHelp')")
 </template>
 
+<style scoped>
+  .faq-question {
+    margin-bottom: 1em;
+  }
+</style>
+
 <script>
 // @TODO:  env.EMAILS.TECH_ASSISTANCE_EMAIL
 const TECH_ASSISTANCE_EMAIL = 'admin@habitica.com';
+import markdownDirective from 'client/directives/markdown';
 
 export default {
+  directives: {
+    markdown: markdownDirective,
+  },
   data () {
+    let headings = [
+      'overview',
+      'set-up-tasks',
+      'sample-tasks',
+      'task-color',
+      'health',
+      'party-with-friends',
+      'pets-mounts',
+      'character-classes',
+      'blue-mana-bar',
+      'monsters-quests',
+      'gems',
+      'bugs-features',
+      'world-boss',
+    ];
+
+    let pageState = {};
+    for (let index in headings) {
+      let heading = headings[index];
+      pageState[heading] = false;
+    }
+
     return {
-      activePage: '',
-      headings: ['overview', 'set-up-tasks', 'sample-tasks', 'task-color', 'health', 'party-with-friends', 'pets-mounts', 'character-classes', 'blue-mana-bar', 'monsters-quests', 'gems', 'bugs-features', 'world-boss'],
+      pageState,
+      headings,
       replacements: {
         techAssistanceEmail: TECH_ASSISTANCE_EMAIL,
         wikiTechAssistanceEmail: `mailto:${TECH_ASSISTANCE_EMAIL}`,
@@ -35,7 +59,7 @@ export default {
   },
   methods: {
     setActivePage (page) {
-      this.activePage = page;
+      this.pageState[page] = !this.pageState[page];
     },
   },
 };
diff --git a/website/client/components/static/overview.vue b/website/client/components/static/overview.vue
index 53c1ea3095..2b05c7562d 100644
--- a/website/client/components/static/overview.vue
+++ b/website/client/components/static/overview.vue
@@ -7,14 +7,18 @@
 
       div(v-for='step in stepsNum')
         h3 {{ $t('step'+step) }}
-        // @TODO: add markdown
-        p(v-html="$t('webStep'+step+'Text')")
+        p(v-markdown="$t('webStep'+step+'Text')")
         hr
-        p(v-html="$t('overviewQuestions')")
+      p(v-markdown="$t('overviewQuestions')")
 </template>
 
 <script>
+import markdownDirective from 'client/directives/markdown';
+
 export default {
+  directives: {
+    markdown: markdownDirective,
+  },
   data () {
     return {
       stepsNum: ['1', '2', '3'],
diff --git a/website/client/mixins/groupsUtilities.js b/website/client/mixins/groupsUtilities.js
index 6efa236f4a..dea0dbf489 100644
--- a/website/client/mixins/groupsUtilities.js
+++ b/website/client/mixins/groupsUtilities.js
@@ -51,11 +51,11 @@ export default {
       }
 
       if (filters.guildSize && filters.guildSize.indexOf('silver_tier') !== -1) {
-        correctSize = group.memberCount > 10 && group.memberCount < 1000;
+        correctSize = group.memberCount > 100 && group.memberCount < 999;
       }
 
       if (filters.guildSize && filters.guildSize.indexOf('bronze_tier') !== -1) {
-        correctSize = group.memberCount < 10;
+        correctSize = group.memberCount < 99;
       }
 
       return passedSearch && hasCategories && isMember && isLeader && correctSize;
diff --git a/website/client/mixins/guide.js b/website/client/mixins/guide.js
index f69b0cb65b..9a2b841b10 100644
--- a/website/client/mixins/guide.js
+++ b/website/client/mixins/guide.js
@@ -37,7 +37,7 @@ export default {
               // state: 'options.profile.avatar',
               element: '.member-details',
               intro: this.$t('tourAvatar'),
-              // placement: 'top',
+              // position: 'top',
               // proceed: this.$t('tourAvatarProceed'),
               // backdrop: false,
               // orphan: true,
@@ -48,7 +48,7 @@ export default {
               // state: 'tasks',
               element: '.todo',
               intro: this.$t('tourToDosBrief'),
-              placement: 'top',
+              position: 'left',
               // proceed: this.$t('tourOkay'),
               // gold: 4,
               // experience: 29,
@@ -57,7 +57,7 @@ export default {
               // state: 'tasks',
               element: '.daily',
               intro: this.$t('tourDailiesBrief'),
-              placement: 'top',
+              position: 'right',
               // proceed: this.$t('tourDailiesProceed'),
               // gold: 4,
               // experience: 29,
@@ -66,7 +66,7 @@ export default {
               // state: 'tasks',
               element: '.habit',
               intro: this.$t('tourHabitsBrief'),
-              placement: 'top',
+              position: 'right',
               // proceed: this.$t('tourHabitsProceed'),
               // gold: 4,
               // experience: 29,
@@ -75,7 +75,7 @@ export default {
               // state: 'tasks',
               element: '.reward',
               intro: this.user.flags.armoireEnabled ? this.$t('tourRewardsArmoire') : this.$t('tourRewardsBrief'),
-              placement: 'left',
+              position: 'left',
               // proceed: this.$t('tourRewardsProceed'),
               // gold: 4,
               // experience: 29,
@@ -276,11 +276,12 @@ export default {
       if (page === -1) page = 0;
       let curr = this.user.flags.tour[chapter];
       if (page !== curr + 1 && !force) return;
-      let chap = this.tour[chapter];
-      if (!chap) return;
-      let opts = chap._options;
-      opts.steps = [];
 
+      // let chap = this.tour[chapter];
+      // if (!chap) return;
+
+      let opts = {}; // @TODO: chap._options;
+      opts.steps = [];
       page += 1;
       times(page, (p) => {
         opts.steps  = opts.steps.concat(this.chapters[chapter][p]);
diff --git a/website/client/router.js b/website/client/router.js
index d3a2b241ae..19433a379d 100644
--- a/website/client/router.js
+++ b/website/client/router.js
@@ -234,8 +234,8 @@ const router = new VueRouter({
         { name: 'overview', path: 'overview', component: OverviewPage },
         { name: 'plans', path: 'plans', component: GroupPlansPage },
         { name: 'pressKit', path: 'press-kit', component: PressKitPage },
-        { name: 'privacy', path: 'privacy', component: PrivacyPage },
-        { name: 'terms', path: 'terms', component: TermsPage },
+        { name: 'privacy', path: 'privacy', component: PrivacyPage, meta: {requiresLogin: false}},
+        { name: 'terms', path: 'terms', component: TermsPage, meta: {requiresLogin: false}},
         { name: 'videos', path: 'videos', component: VideosPage },
       ],
     },
diff --git a/website/client/store/actions/challenges.js b/website/client/store/actions/challenges.js
index 8ef7d980c7..421009d4a5 100644
--- a/website/client/store/actions/challenges.js
+++ b/website/client/store/actions/challenges.js
@@ -3,8 +3,11 @@ import omit from 'lodash/omit';
 
 export async function createChallenge (store, payload) {
   let response = await axios.post('/api/v3/challenges', payload.challenge);
+  let newChallenge = response.data.data;
 
-  return response.data.data;
+  store.state.user.data.challenges.push(newChallenge._id);
+
+  return newChallenge;
 }
 
 export async function joinChallenge (store, payload) {
@@ -42,7 +45,7 @@ export async function getChallenge (store, payload) {
 }
 
 export async function exportChallengeCsv (store, payload) {
-  let response = await axios.get(`/api/v3/challenges/challenges/${payload.challengeId}/export/csv`);
+  let response = await axios.get(`/api/v3/challenges/${payload.challengeId}/export/csv`);
 
   return response.data.data;
 }
@@ -59,13 +62,13 @@ export async function updateChallenge (store, payload) {
 }
 
 export async function deleteChallenge (store, payload) {
-  let response = await axios.delete(`/api/v3/challenges/challenges/${payload.challengeId}`);
+  let response = await axios.delete(`/api/v3/challenges/${payload.challengeId}`);
 
   return response.data.data;
 }
 
 export async function selectChallengeWinner (store, payload) {
-  let response = await axios.post(`/api/v3/challenges/challenges/${payload.challengeId}/selectWinner/${payload.winnerId}`);
+  let response = await axios.post(`/api/v3/challenges/${payload.challengeId}/selectWinner/${payload.winnerId}`);
 
   return response.data.data;
 }
diff --git a/website/client/store/index.js b/website/client/store/index.js
index aa36d875e9..abfed49e18 100644
--- a/website/client/store/index.js
+++ b/website/client/store/index.js
@@ -14,6 +14,7 @@ const IS_TEST = process.env.NODE_ENV === 'test'; // eslint-disable-line no-proce
 // Load user auth parameters and determine if it's logged in
 // before trying to load data
 let isUserLoggedIn = false;
+axios.defaults.headers.common['x-client'] = 'habitica-web';
 
 let AUTH_SETTINGS = localStorage.getItem('habit-mobile-settings');
 
diff --git a/website/common/locales/en/newClient.json b/website/common/locales/en/newClient.json
index cd0fab88ae..d32dd97590 100644
--- a/website/common/locales/en/newClient.json
+++ b/website/common/locales/en/newClient.json
@@ -125,7 +125,7 @@
   "emailPlaceholder": "e.g., rabbit@habitica.com",
   "passwordPlaceholder": "e.g., •••••••••••• ",
   "confirmPasswordPlaceholder": "Make sure it’s the same password!",
-  "termsAndAgreement": "By clicking the button below, you are indicating that you have read and agree to the <a href=''>Terms of Service</a> and <a href=''>Privacy Policy</a>.",
+  "termsAndAgreement": "By clicking the button below, you are indicating that you have read and agree to the <a href='/static/terms'>Terms of Service</a> and <a href='/static/privacy'>Privacy Policy</a>.",
   "joinHabitica": "Join Habitica",
   "showAllAnimals": "Show All <%= color %> <%= type %>",
   "showLessAnimals": "Show Less <%= color %> <%= type %>",
@@ -248,12 +248,16 @@
   "owned": "Owned",
   "not_owned": "Not Owned",
   "participantsTitle": "Participants",
-  "shortName": "What short tag should be used to identify your Challenge?",
+  "shortName": "Short Name",
+  "shortNamePlaceholder": "What short tag should be used to identify your Challenge?",
   "classArmor": "Class Armor",
   "backCapitalized": "Back Accessory",
   "bodyCapitalized": "Body Accessory",
   "eyewearCapitalized": "Eyewear",
   "featuredset": "Featured Set <%= name %>",
   "mysterySets": "Mystery Sets",
-  "fetchRecentMessages": "Fetch Recent Messages"
+  "fetchRecentMessages": "Fetch Recent Messages",
+  "tavernChat": "Tavern Chat",
+  "partyChatPlaceholder": "Type message to Party members here",
+  "done": "Done"
 }