diff --git a/website/client/assets/images/group-plans/group-12.png b/website/client/assets/images/group-plans/group-12.png
new file mode 100755
index 0000000000..1f11d2ebbf
Binary files /dev/null and b/website/client/assets/images/group-plans/group-12.png differ
diff --git a/website/client/assets/images/group-plans/group-12@2x.png b/website/client/assets/images/group-plans/group-12@2x.png
new file mode 100755
index 0000000000..ce56c1dd9b
Binary files /dev/null and b/website/client/assets/images/group-plans/group-12@2x.png differ
diff --git a/website/client/assets/images/group-plans/group-12@3x.png b/website/client/assets/images/group-plans/group-12@3x.png
new file mode 100755
index 0000000000..e9a06e0379
Binary files /dev/null and b/website/client/assets/images/group-plans/group-12@3x.png differ
diff --git a/website/client/assets/images/group-plans/group-13.png b/website/client/assets/images/group-plans/group-13.png
new file mode 100755
index 0000000000..5456010ea6
Binary files /dev/null and b/website/client/assets/images/group-plans/group-13.png differ
diff --git a/website/client/assets/images/group-plans/group-13@2x.png b/website/client/assets/images/group-plans/group-13@2x.png
new file mode 100755
index 0000000000..faa1dacc1f
Binary files /dev/null and b/website/client/assets/images/group-plans/group-13@2x.png differ
diff --git a/website/client/assets/images/group-plans/group-13@3x.png b/website/client/assets/images/group-plans/group-13@3x.png
new file mode 100755
index 0000000000..c5c74fd8d2
Binary files /dev/null and b/website/client/assets/images/group-plans/group-13@3x.png differ
diff --git a/website/client/assets/images/group-plans/group-14.png b/website/client/assets/images/group-plans/group-14.png
new file mode 100755
index 0000000000..f47daa0047
Binary files /dev/null and b/website/client/assets/images/group-plans/group-14.png differ
diff --git a/website/client/assets/images/group-plans/group-14@2x.png b/website/client/assets/images/group-plans/group-14@2x.png
new file mode 100755
index 0000000000..2d0a88d474
Binary files /dev/null and b/website/client/assets/images/group-plans/group-14@2x.png differ
diff --git a/website/client/assets/images/group-plans/group-14@3x.png b/website/client/assets/images/group-plans/group-14@3x.png
new file mode 100755
index 0000000000..e4571e3e68
Binary files /dev/null and b/website/client/assets/images/group-plans/group-14@3x.png differ
diff --git a/website/client/assets/svg/for-css/quest-border.svg b/website/client/assets/svg/for-css/quest-border.svg
new file mode 100644
index 0000000000..32ee46160c
--- /dev/null
+++ b/website/client/assets/svg/for-css/quest-border.svg
@@ -0,0 +1,36 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" preserveAspectRatio="none" viewBox="0 0 424 80">
+    <defs>
+        <path id="a" d="M0 0h424v80H0z"/>
+        <path id="b" d="M0 0h10v10H0z"/>
+        <path id="c" d="M0 0h10v10H0z"/>
+        <path id="d" d="M0 0h10v10H0z"/>
+        <path id="e" d="M0 0h10v10H0z"/>
+    </defs>
+    <g fill="none" fill-rule="evenodd">
+        <g>
+            <use fill="#F9F9F9" xlink:href="#a"/>
+            <path stroke="#E1E0E3" stroke-width="4" d="M2 2h420v76H2z"/>
+            <path stroke="#C3C0C7" stroke-width="2" d="M1 1h422v78H1z"/>
+        </g>
+        <g transform="translate(0 70)">
+            <use fill="#EDECEE" xlink:href="#b"/>
+            <path stroke="#E1E0E3" stroke-width="4" d="M2 2h6v6H2z"/>
+            <path stroke="#C3C0C7" stroke-width="2" d="M1 1h8v8H1z"/>
+        </g>
+        <g transform="translate(414 70)">
+            <use fill="#EDECEE" xlink:href="#c"/>
+            <path stroke="#E1E0E3" stroke-width="4" d="M2 2h6v6H2z"/>
+            <path stroke="#C3C0C7" stroke-width="2" d="M1 1h8v8H1z"/>
+        </g>
+        <g transform="translate(414)">
+            <use fill="#EDECEE" xlink:href="#d"/>
+            <path stroke="#E1E0E3" stroke-width="4" d="M2 2h6v6H2z"/>
+            <path stroke="#C3C0C7" stroke-width="2" d="M1 1h8v8H1z"/>
+        </g>
+        <g>
+            <use fill="#EDECEE" xlink:href="#e"/>
+            <path stroke="#E1E0E3" stroke-width="4" d="M2 2h6v6H2z"/>
+            <path stroke="#C3C0C7" stroke-width="2" d="M1 1h8v8H1z"/>
+        </g>
+    </g>
+</svg>
diff --git a/website/client/assets/svg/quest-background-border.svg b/website/client/assets/svg/quest-background-border.svg
index 81ae0b5bb3..eb1fca7881 100644
--- a/website/client/assets/svg/quest-background-border.svg
+++ b/website/client/assets/svg/quest-background-border.svg
@@ -2,35 +2,35 @@
     <defs>
         <path id="a" d="M0 0h424v80H0z"/>
         <path id="b" d="M0 0h10v10H0z"/>
-        <path id="c" d="M414 0h10v10h-10z"/>
-        <path id="d" d="M0 70h10v10H0z"/>
-        <path id="e" d="M414 70h10v10h-10z"/>
+        <path id="c" d="M0 0h10v10H0z"/>
+        <path id="d" d="M0 0h10v10H0z"/>
+        <path id="e" d="M0 0h10v10H0z"/>
     </defs>
-    <g fill="#F9F9F9" fill-rule="evenodd">
+    <g fill="none" fill-rule="evenodd">
         <g>
             <use fill="#F9F9F9" xlink:href="#a"/>
             <path stroke="#E1E0E3" stroke-width="4" d="M2 2h420v76H2z"/>
             <path stroke="#C3C0C7" stroke-width="2" d="M1 1h422v78H1z"/>
         </g>
-        <g>
+        <g transform="translate(0 70)">
             <use fill="#EDECEE" xlink:href="#b"/>
             <path stroke="#E1E0E3" stroke-width="4" d="M2 2h6v6H2z"/>
             <path stroke="#C3C0C7" stroke-width="2" d="M1 1h8v8H1z"/>
         </g>
-        <g>
+        <g transform="translate(414 70)">
             <use fill="#EDECEE" xlink:href="#c"/>
-            <path stroke="#E1E0E3" stroke-width="4" d="M416 2h6v6h-6z"/>
-            <path stroke="#C3C0C7" stroke-width="2" d="M415 1h8v8h-8z"/>
+            <path stroke="#E1E0E3" stroke-width="4" d="M2 2h6v6H2z"/>
+            <path stroke="#C3C0C7" stroke-width="2" d="M1 1h8v8H1z"/>
         </g>
-        <g>
+        <g transform="translate(414)">
             <use fill="#EDECEE" xlink:href="#d"/>
-            <path stroke="#E1E0E3" stroke-width="4" d="M2 72h6v6H2z"/>
-            <path stroke="#C3C0C7" stroke-width="2" d="M1 71h8v8H1z"/>
+            <path stroke="#E1E0E3" stroke-width="4" d="M2 2h6v6H2z"/>
+            <path stroke="#C3C0C7" stroke-width="2" d="M1 1h8v8H1z"/>
         </g>
         <g>
             <use fill="#EDECEE" xlink:href="#e"/>
-            <path stroke="#E1E0E3" stroke-width="4" d="M416 72h6v6h-6z"/>
-            <path stroke="#C3C0C7" stroke-width="2" d="M415 71h8v8h-8z"/>
+            <path stroke="#E1E0E3" stroke-width="4" d="M2 2h6v6H2z"/>
+            <path stroke="#C3C0C7" stroke-width="2" d="M1 1h8v8H1z"/>
         </g>
     </g>
 </svg>
diff --git a/website/client/components/chat/chatMessages.vue b/website/client/components/chat/chatMessages.vue
index 45bac36cf8..e205e6c04c 100644
--- a/website/client/components/chat/chatMessages.vue
+++ b/website/client/components/chat/chatMessages.vue
@@ -18,7 +18,9 @@
           :hideClassBadge='true')
       .card.col-8
         .card-block
-            h3.leader(:class='userLevelStyle(cachedProfileData[msg.uuid])') {{msg.user}}
+            h3.leader(:class='userLevelStyle(cachedProfileData[msg.uuid])')
+              | {{msg.user}}
+              .svg-icon(v-html="`icons.tier${cachedProfileData[msg.uuid].contributor.level}`", v-if='cachedProfileData[msg.uuid] && cachedProfileData[msg.uuid].contributor && cachedProfileData[msg.uuid].contributor.level')
             p {{msg.timestamp | timeAgo}}
             .text(v-markdown='msg.text')
             hr
@@ -41,7 +43,9 @@
     .row(v-if='user._id === msg.uuid')
       .card.col-8.offset-2
         .card-block
-            h3.leader(:class='userLevelStyle(cachedProfileData[msg.uuid])') {{msg.user}}
+            h3.leader(:class='userLevelStyle(cachedProfileData[msg.uuid])')
+              | {{msg.user}}
+              .svg-icon(v-html="icons[`tier${cachedProfileData[msg.uuid].contributor.level}`]", v-if='cachedProfileData[msg.uuid] && cachedProfileData[msg.uuid].contributor && cachedProfileData[msg.uuid].contributor.level')
             p {{msg.timestamp | timeAgo}}
             .text(v-markdown='msg.text')
             hr
@@ -70,6 +74,56 @@
 <style lang="scss" scoped>
   @import '~client/assets/scss/colors.scss';
 
+  // @TODO: Move this to an scss?
+  .tier1 {
+    color: #c42870;
+  }
+
+  .tier2 {
+    color: #b01515;
+  }
+
+  .tier3 {
+    color: #d70e14;
+  }
+
+  .tier4 {
+    color: #c24d00;
+  }
+
+  .tier5 {
+    color: #9e650f;
+  }
+
+  .tier6 {
+    color: #2b8363;
+  }
+
+  .tier7 {
+    color: #167e87;
+  }
+
+  .moderator {
+    color: #277eab;
+  }
+
+  .staff {
+    color: #6133b4;
+  }
+
+  .npc {
+    color: $black;
+  }
+  // End of tier colors
+
+  h3 {
+    .svg-icon {
+      width: 10px;
+      display: inline-block;
+      margin-left: .5em;
+    }
+  }
+
   .hr {
     width: 100%;
     height: 20px;
@@ -141,6 +195,16 @@ import copyIcon from 'assets/svg/copy.svg';
 import likeIcon from 'assets/svg/like.svg';
 import likedIcon from 'assets/svg/liked.svg';
 import reportIcon from 'assets/svg/report.svg';
+import tier1 from 'assets/svg/tier-1.svg';
+import tier2 from 'assets/svg/tier-2.svg';
+import tier3 from 'assets/svg/tier-3.svg';
+import tier4 from 'assets/svg/tier-4.svg';
+import tier5 from 'assets/svg/tier-5.svg';
+import tier6 from 'assets/svg/tier-6.svg';
+import tier7 from 'assets/svg/tier-7.svg';
+import tierMod from 'assets/svg/tier-mod.svg';
+import tierNPC from 'assets/svg/tier-npc.svg';
+import tierStaff from 'assets/svg/tier-staff.svg';
 
 export default {
   props: ['chat', 'groupId', 'groupName', 'inbox'],
@@ -172,6 +236,16 @@ export default {
         report: reportIcon,
         delete: deleteIcon,
         liked: likedIcon,
+        tier1,
+        tier2,
+        tier3,
+        tier4,
+        tier5,
+        tier6,
+        tier7,
+        tierMod,
+        tierNPC,
+        tierStaff,
       }),
       copyingMessage: {},
       currentDayDividerDisplay: moment().day(),
diff --git a/website/client/components/groups/group.vue b/website/client/components/groups/group.vue
index 783d9804dc..232b248258 100644
--- a/website/client/components/groups/group.vue
+++ b/website/client/components/groups/group.vue
@@ -76,32 +76,32 @@
           .col-12.text-center
             .quest-boss(:class="'quest_' + questData.key")
             h3(v-once) {{ questData.text() }}
-            .quest-box.svg-icon(v-html="icons.questBackground")
-            .collect-info(v-if='questData.collect')
-              .row(v-for='(value, key) in questData.collect')
-                .col-2
-                  div(:class="'quest_' + questData.key + '_' + key")
-                .col-10
-                  strong {{value.text()}}
-                  .grey-progress-bar
-                    .collect-progress-bar(:style="{width: (group.quest.progress.collect[key] / value.count) * 100 + '%'}")
-                  strong {{group.quest.progress.collect[key]}} / {{value.count}}
-            .boss-info(v-if='questData.boss')
-              .row
-                .col-6
-                  h4.float-left(v-once) {{ questData.boss.name() }}
-                .col-6
-                  span.float-right(v-once) {{ $t('participantsTitle') }}
-              .row
-                .col-12
-                  .grey-progress-bar
-                    .boss-health-bar(:style="{width: (group.quest.progress.hp / questData.boss.hp) * 100 + '%'}")
-              .row.boss-details
+            .quest-box
+              .collect-info(v-if='questData.collect')
+                .row(v-for='(value, key) in questData.collect')
+                  .col-2
+                    div(:class="'quest_' + questData.key + '_' + key")
+                  .col-10
+                    strong {{value.text()}}
+                    .grey-progress-bar
+                      .collect-progress-bar(:style="{width: (group.quest.progress.collect[key] / value.count) * 100 + '%'}")
+                    strong {{group.quest.progress.collect[key]}} / {{value.count}}
+              .boss-info(v-if='questData.boss')
+                .row
                   .col-6
-                    span.float-left
-                      | {{parseFloat(group.quest.progress.hp).toFixed(2)}} / {{parseFloat(questData.boss.hp).toFixed(2)}}
+                    h4.float-left(v-once) {{ questData.boss.name() }}
                   .col-6
-                    span.float-right {{group.quest.progress.up || 0}} pending damage
+                    span.float-right(v-once) {{ $t('participantsTitle') }}
+                .row
+                  .col-12
+                    .grey-progress-bar
+                      .boss-health-bar(:style="{width: (group.quest.progress.hp / questData.boss.hp) * 100 + '%'}")
+                .row.boss-details
+                    .col-6
+                      span.float-left
+                        | {{parseFloat(group.quest.progress.hp).toFixed(2)}} / {{parseFloat(questData.boss.hp).toFixed(2)}}
+                    .col-6
+                      span.float-right {{group.quest.progress.up || 0}} pending damage
             button.btn.btn-secondary(v-once, @click="questAbort()") {{ $t('abort') }}
 
     .section-header
@@ -309,8 +309,11 @@
 
   .quest-active-section {
     .quest-box {
-      height: 100px;
+      background-image: url('~client/assets/svg/for-css/quest-border.svg');
+      background-size: 100% 100%;
       width: 100%;
+      padding: .5em;
+      margin-bottom: 1em;
 
       svg: {
         width: 100%;
@@ -319,10 +322,8 @@
     }
 
     .boss-info, .collect-info {
-      position: relative;
-      top: -89px;
-      left: 15px;
-      width: 32em;
+      width: 90%;
+      margin: 0 auto;
       text-align: left;
     }
   }
diff --git a/website/client/components/groups/groupFormModal.vue b/website/client/components/groups/groupFormModal.vue
index 1ddda901f2..bfcab72dc7 100644
--- a/website/client/components/groups/groupFormModal.vue
+++ b/website/client/components/groups/groupFormModal.vue
@@ -302,6 +302,12 @@ export default {
         this.workingGroup.privateGuild = false;
       }
 
+      if (editingGroup.categories) {
+        editingGroup.categories.forEach(category => {
+          this.workingGroup.categories.push(category.slug);
+        });
+      }
+
       if (editingGroup.summary) this.workingGroup.summary = editingGroup.summary;
       if (editingGroup.description) this.workingGroup.description = editingGroup.description;
       if (editingGroup._id) this.workingGroup.id = editingGroup._id;
diff --git a/website/client/components/groups/groupPlan.vue b/website/client/components/groups/groupPlan.vue
index 7585b3759f..264d80c7da 100644
--- a/website/client/components/groups/groupPlan.vue
+++ b/website/client/components/groups/groupPlan.vue
@@ -10,16 +10,22 @@ div
       .row
         .col-4
           .box
+            img.box1(src='~client/assets/images/group-plans/group-14@3x.png')
+            hr
             h2 {{ $t('teamBasedTasks') }}
             p Set up an easily-viewed shared task list for the group. Assign tasks to your fellow group members, or let them claim their own tasks to make it clear what everyone is working on!
 
         .col-4
           .box
+            img.box2(src='~client/assets/images/group-plans/group-12@3x.png')
+            hr
             h2 Group Management Controls
             p Use task approvals to verify that a task that was really completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.
 
         .col-4
           .box
+            img.box3(src='~client/assets/images/group-plans/group-13@3x.png')
+            hr
             h2 In-Game Benefits
             p Group members get an exclusive Jackalope Mount, as well as full subscription benefits, including special monthly equipment sets and the ability to buy gems with gold.
 
@@ -127,6 +133,14 @@ div
 
   .benefits {
     margin-top: -12em;
+
+    .box {
+      height: 416px;
+    }
+
+    h2 {
+      color: #6133b4;
+    }
   }
 
   .box {
@@ -135,6 +149,27 @@ div
     box-shadow: 0 2px 2px 0 rgba(26, 24, 29, 0.16), 0 1px 4px 0 rgba(26, 24, 29, 0.12);
     padding: 2em;
     text-align: center;
+
+    img {
+      margin: 0 auto;
+      margin-top: 2em;
+      margin-bottom: 1em;
+    }
+  }
+
+  img.box1 {
+    width: 266px;
+  }
+
+  img.box2 {
+    margin-top: 3.5em;
+    width: 262px;
+    margin-bottom: 3.7em;
+  }
+
+  img.box3 {
+    width: 225px;
+    margin-bottom: 3.0em;
   }
 
   button.create-group {
diff --git a/website/client/components/groups/tavern.vue b/website/client/components/groups/tavern.vue
index 019de7de94..5888103a59 100644
--- a/website/client/components/groups/tavern.vue
+++ b/website/client/components/groups/tavern.vue
@@ -26,7 +26,7 @@
   .col-md-4.sidebar
     .section
       .grassy-meadow-backdrop
-      .daniel_front
+        .daniel_front
 
       .sleep.below-header-sections
         strong(v-once) {{ $t('sleepDescription') }}
@@ -228,10 +228,9 @@
 
   .daniel_front {
     background-image: url('~assets/images/tavern_backdrop_web_daniel_and_props.png');
-    width: 100%;
     height: 246px;
-    position: absolute;
-    top: 0;
+    width: 471px;
+    background-repeat: no-repeat;
     margin: 0 auto;
   }
 
@@ -310,11 +309,11 @@
       color: #167e87;
     }
 
-    .moderator {
+    .tier8, .moderator {
       color: #277eab;
     }
 
-    .staff {
+    .tier9, .staff {
       color: #6133b4;
     }
 
diff --git a/website/client/components/notificationMenu.vue b/website/client/components/notificationMenu.vue
index 37ab35e3fd..75d304752d 100644
--- a/website/client/components/notificationMenu.vue
+++ b/website/client/components/notificationMenu.vue
@@ -285,14 +285,14 @@ export default {
 
       if (type === 'party') {
         // @TODO: pretty sure mutability is wrong. Need to check React docs
-        this.user.invitations.party.splice(index, 1);
+        this.user.invitations.parties.splice(index, 1);
       } else {
         this.user.invitations.guilds.splice(index, 1);
       }
 
       if (type === 'party') {
         this.user.party._id = group.id;
-        this.$router.push('/groups/party');
+        this.$router.push('/party');
       } else {
         this.user.guilds.push(group.id);
         this.$router.push(`/groups/guild/${group.id}`);
diff --git a/website/client/components/tasks/approvalFooter.vue b/website/client/components/tasks/approvalFooter.vue
index 1f28f79545..95810ba4e7 100644
--- a/website/client/components/tasks/approvalFooter.vue
+++ b/website/client/components/tasks/approvalFooter.vue
@@ -9,7 +9,7 @@ div
     .row.task-single-approval(v-if='approvalRequested')
       .col-6.text-center
         a(@click='approve()') Approve Task
-      .col-6.text-center
+      // @TODO: Implement in v2 .col-6.text-center
         a Needs work
     .text-center.task-multi-approval(v-if='multipleApprovalsRequested')
       a(@click='showRequests()') View Requests
diff --git a/website/client/components/userMenu/inbox.vue b/website/client/components/userMenu/inbox.vue
index bc907a464b..aa1545ae11 100644
--- a/website/client/components/userMenu/inbox.vue
+++ b/website/client/components/userMenu/inbox.vue
@@ -29,12 +29,12 @@
              span.timeago {{conversation.date | timeAgo}}
             div {{conversation.lastMessageText.substring(0, 30)}}
       .col-8.messages
-        chat-message.container-fluid(:chat.sync='activeChat', :inbox='true')
+        chat-message.container-fluid.message-scroll(:chat.sync='activeChat', :inbox='true')
 
         // @TODO: Implement new message header here when we fix the above
 
         .new-message-row(v-if='selectedConversation')
-          b-form-input(v-model='newMessage')
+          input(v-model='newMessage')
           button.btn.btn-secondary(@click='sendPrivateMessage()') Send
 </template>
 
@@ -67,6 +67,11 @@
     padding-bottom: 6em;
   }
 
+  .message-scroll {
+    max-height: 500px;
+    overflow: scroll;
+  }
+
   .to-form input {
     width: 60%;
     display: inline-block;
diff --git a/website/client/components/userMenu/profile.vue b/website/client/components/userMenu/profile.vue
index bff47fc361..ac406af3c5 100644
--- a/website/client/components/userMenu/profile.vue
+++ b/website/client/components/userMenu/profile.vue
@@ -95,7 +95,7 @@ div
         .col-6(v-if='user.achievements.quests')
           h2 Quests Completed
           div(v-for='(value, key) in user.achievements.quests')
-            span {{ content.quests[k].text() }}
+            span {{ content.quests[key].text() }}
             span {{ value }}
     .standard-page(v-show='selectedPage === "stats"', v-if='user.preferences')
       .row
diff --git a/website/client/mixins/styleHelper.js b/website/client/mixins/styleHelper.js
index 83e92db4b3..9bfc3a85f7 100644
--- a/website/client/mixins/styleHelper.js
+++ b/website/client/mixins/styleHelper.js
@@ -9,8 +9,8 @@ export default {
     },
     userLevelStyleFromLevel (level, npc, style) {
       style = style || '';
-      if (npc) style += ' label-npc';
-      if (level) style +=   ` label-contributor-${level}`;
+      if (npc) style += ' npc';
+      if (level) style +=   ` tier${level}`;
       return style;
     },
   },