diff --git a/website/client/components/chat/chatMessages.vue b/website/client/components/chat/chatMessages.vue
index 1181d56ce7..96a63346cf 100644
--- a/website/client/components/chat/chatMessages.vue
+++ b/website/client/components/chat/chatMessages.vue
@@ -286,7 +286,7 @@ export default {
   methods: {
     canViewFlag (message) {
       if (message.uuid === this.user._id) return true;
-      if (message.flagCount === 0) return true;
+      if (!message.flagCount || message.flagCount === 0) return true;
       return this.user.contributor.admin;
     },
     async loadProfileCache (screenPosition) {
diff --git a/website/client/components/groups/group.vue b/website/client/components/groups/group.vue
index d3ab6edb9a..c85fc222a8 100644
--- a/website/client/components/groups/group.vue
+++ b/website/client/components/groups/group.vue
@@ -109,7 +109,8 @@
                       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
+                      // @TODO: Why do we not sync quset progress on the group doc? Each user could have different progress
+                      span.float-right {{user.party.quest.progress.up || 0}} pending damage
                 .row.rage-bar-row(v-if='questData.boss.rage')
                   .col-12
                     .grey-progress-bar
@@ -684,8 +685,8 @@ export default {
 
       let group = await this.$store.dispatch('guilds:getGroup', {groupId: this.searchId});
       if (this.isParty) {
-        this.$store.party = group;
-        this.group = this.$store.party;
+        this.$store.state.party.data = group;
+        this.group = this.$store.state.party.data;
         this.checkForAchievements();
         return;
       }
diff --git a/website/client/components/groups/membersModal.vue b/website/client/components/groups/membersModal.vue
index 74fe34e944..8cd1b2d624 100644
--- a/website/client/components/groups/membersModal.vue
+++ b/website/client/components/groups/membersModal.vue
@@ -185,10 +185,13 @@ export default {
       userIdToMessage: '',
     };
   },
+  mounted () {
+    this.getMembers();
+  },
   computed: {
     ...mapState({user: 'user.data'}),
     isLeader () {
-      if (!this.group.leader) return false;
+      if (!this.group || !this.group.leader) return false;
       return this.user._id === this.group.leader || this.user._id === this.group.leader._id;
     },
     groupIsSubscribed () {
@@ -245,7 +248,7 @@ export default {
       }
 
       if (this.$store.state.memberModalOptions.viewingMembers.length > 0) {
-        this.members = this.$store.state.viewingMembers;
+        this.members = this.$store.state.memberModalOptions.viewingMembers;
       }
     },
     async clickMember (uid, forceShow) {
diff --git a/website/client/components/groups/startQuestModal.vue b/website/client/components/groups/startQuestModal.vue
index 29648adfce..369bf06fd9 100644
--- a/website/client/components/groups/startQuestModal.vue
+++ b/website/client/components/groups/startQuestModal.vue
@@ -218,7 +218,7 @@ export default {
       const response = await this.$store.dispatch('guilds:inviteToQuest', {groupId: this.group._id, key});
       const quest = response.data.data;
 
-      this.$store.party.quest = quest;
+      this.$store.party.data.quest = quest;
       this.$root.$emit('hide::modal', 'start-quest-modal');
     },
   },
diff --git a/website/client/components/modifyInventory.vue b/website/client/components/modifyInventory.vue
index 78ef5f17e9..a0460c0acd 100644
--- a/website/client/components/modifyInventory.vue
+++ b/website/client/components/modifyInventory.vue
@@ -1,5 +1,5 @@
 <template lang="pug">
-  b-modal#modify-inventory(title="Modify Inventory", size='lg', :hide-footer="true")
+  b-modal#modify-inventory(v-if='user.profile', title="Modify Inventory", size='lg', :hide-footer="true")
     .modal-header
       h4 Modify Inventory for {{user.profile.name}}
     .modal-body
diff --git a/website/client/libs/createAnimal.js b/website/client/libs/createAnimal.js
index 0f5e60ebcc..f677cc1499 100644
--- a/website/client/libs/createAnimal.js
+++ b/website/client/libs/createAnimal.js
@@ -5,9 +5,9 @@ export default function createAnimal (egg, potion, type, content, userItems) {
     key: animalKey,
     class: type === 'pet' ? `Pet Pet-${animalKey}` : `Mount_Icon_${animalKey}`,
     eggKey: egg.key,
-    eggName: egg.text(),
+    eggName: egg.text,
     potionKey: potion.key,
-    potionName: potion.text(),
+    potionName: potion.text,
     name: content[`${type}Info`][animalKey].text(),
     isOwned () {
       return userItems[`${type}s`][animalKey] > 0;
diff --git a/website/client/store/actions/members.js b/website/client/store/actions/members.js
index 819334b622..68e06a59a8 100644
--- a/website/client/store/actions/members.js
+++ b/website/client/store/actions/members.js
@@ -26,7 +26,7 @@ export async function getGroupInvites (store, payload) {
 }
 
 export async function getChallengeMembers (store, payload) {
-  let url = `${apiV3Prefix}/challenges/${payload.challengeId}/members?includeAllMembers=true&includeAllPublicFields=true`;
+  let url = `${apiV3Prefix}/challenges/${payload.challengeId}/members?includeAllPublicFields=true`;
   let response = await axios.get(url);
   return response.data.data;
 }
diff --git a/website/client/store/actions/shops.js b/website/client/store/actions/shops.js
index 4a9b4c5880..00c3c7700d 100644
--- a/website/client/store/actions/shops.js
+++ b/website/client/store/actions/shops.js
@@ -6,6 +6,7 @@ import buyMysterySetOp from 'common/script/ops/buyMysterySet';
 import hourglassPurchaseOp from 'common/script/ops/hourglassPurchase';
 import sellOp from 'common/script/ops/sell';
 import unlockOp from 'common/script/ops/unlock';
+import buyArmoire from 'common/script/ops/buyArmoire';
 
 export function buyItem (store, params) {
   const user = store.state.user.data;
@@ -72,7 +73,20 @@ export function genericPurchase (store, params) {
     case 'mystery_set':
       return purchaseMysterySet(store, params);
     case 'potion':
-    case 'armoire':
+    case 'armoire': // eslint-disable-line
+      let buyResult = buyArmoire(store.state.user.data);
+
+      // @TODO: We might need to abstract notifications to library rather than mixin
+      if (buyResult[1]) {
+        store.state.notificationStore.push({
+          title: '',
+          text: buyResult[1],
+          type: 'drop',
+          timeout: true,
+        });
+      }
+
+      return;
     case 'marketGear':
       return buyItem(store, params);
     case 'background':
diff --git a/website/common/script/libs/shops.js b/website/common/script/libs/shops.js
index d55f4aa3d4..99fa92db3f 100644
--- a/website/common/script/libs/shops.js
+++ b/website/common/script/libs/shops.js
@@ -92,6 +92,12 @@ shops.checkMarketGearLocked = function checkMarketGearLocked (user, items) {
     if (!gear.locked  && !availableGear.includes(gear.path)) {
       gear.locked = true;
     }
+
+    // @TODO: I'm not sure what the logic for locking is supposed to be
+    // But, I am pretty sure if we pin an armoire item, it needs to be unlocked
+    if (gear.klass === 'armoire') {
+      gear.locked = false;
+    }
   }
 };