diff --git a/src/layouts/Layout.vue b/src/layouts/Layout.vue
index 1540ee7a9..19cdeea81 100644
--- a/src/layouts/Layout.vue
+++ b/src/layouts/Layout.vue
@@ -190,8 +190,8 @@ export default {
         this.$store.commit('dao/setDAO', data?.queryDao[0])
         this.$store.dispatch('dao/setTheme')
         this.state = STATE.READY
-      }
-      // fetchPolicy: 'no-cache'
+      },
+      fetchPolicy: 'no-cache'
       // pollInterval: 300 // TODO: Swap with subscribe once dgraph is ready
     },
 
@@ -201,8 +201,8 @@ export default {
       variables() { return { daoUrl: this.dhoname } },
       async result (res) {
         this.$store.commit('dao/setPlan', res?.data?.activePlan)
-      }
-      // fetchPolicy: 'no-cache'
+      },
+      fetchPolicy: 'no-cache'
     }
 
   },
@@ -234,7 +234,7 @@ export default {
 <template lang="pug">
 .layout
   .spinner(v-if="state === STATE.LOADING")
-  component(v-else :is="layout" v-bind="{ dhoname }")
+  component(v-else :is="layout" v-bind="{ dao, dhoname }")
 </template>
 
 <style scoped lang="stylus">
diff --git a/src/layouts/MultiDhoLayout.vue b/src/layouts/MultiDhoLayout.vue
index 723e53269..76680a810 100644
--- a/src/layouts/MultiDhoLayout.vue
+++ b/src/layouts/MultiDhoLayout.vue
@@ -352,7 +352,8 @@ export default {
   },
 
   props: {
-    dhoname: String
+    dhoname: String,
+    dao: Object
   },
 
   apollo: {
diff --git a/src/pages/proposals/ProposalDetail.vue b/src/pages/proposals/ProposalDetail.vue
index 026be01a8..9289ee0e3 100644
--- a/src/pages/proposals/ProposalDetail.vue
+++ b/src/pages/proposals/ProposalDetail.vue
@@ -3,7 +3,7 @@ import { mapActions, mapGetters } from 'vuex'
 import gql from 'graphql-tag'
 
 import CONFIG from './create/config.js'
-import { PROPOSAL_STATE, PROPOSAL_TYPE } from '~/const'
+import { PROPOSAL_STATE, PROPOSAL_TYPE, DEFAULT_TIER } from '~/const'
 // import { calcVoicePercentage } from '~/utils/eosio'
 
 import { format } from '~/mixins/format'
@@ -94,13 +94,13 @@ const PROPOSAL_QUERY = `
     }
 
     ... on Budget {
-        ballot_expiration_t
-        details_title_s
-        details_description_s
-        details_state_s
-        details_ballotQuorum_i
-        details_ballotSupply_a
-        details_ballotAlignment_i
+      ballot_expiration_t
+      details_title_s
+      details_description_s
+      details_state_s
+      details_ballotQuorum_i
+      details_ballotSupply_a
+      details_ballotAlignment_i
 
       votetally {
         docId
@@ -112,61 +112,61 @@ const PROPOSAL_QUERY = `
         }
       }
 
-        circle {
-          ... on Circle {
+      circle {
+        ... on Circle {
+          id: docId
+          name: details_title_s
+          purpose: details_description_s
+          budget: details_purpose_s
+
+          applicant {
+            username: details_member_n
+          }
+
+          members: member {
+            username: details_member_n
+          }
+
+          subcircles: subcircle {
             id: docId
             name: details_title_s
             purpose: details_description_s
             budget: details_purpose_s
-
-            applicant {
-              username: details_member_n
-            }
-
-            members: member {
-              username: details_member_n
-            }
-
-            subcircles: subcircle {
-              id: docId
-              name: details_title_s
-              purpose: details_description_s
-              budget: details_purpose_s
-            }
           }
         }
-        details_pegAmount_a
-        details_voiceAmount_a
-        details_rewardAmount_a
-        creator
-        createdDate
+      }
+      details_pegAmount_a
+      details_voiceAmount_a
+      details_rewardAmount_a
+      creator
+      createdDate
 
-        cmntsect {
-          docId
+      cmntsect {
+        docId
 
-          comment {
-            id: docId
-            author: comment_author_n
-            content: comment_content_s
-            createdDate
-            deletedStatus: comment_deleted_i
-
-            reactions: reaction {
-              reactionlnkrAggregate {
-                count
-              }
-
-              reactionlnkr {
-                author: details_member_n
-              }
-            }
+        comment {
+          id: docId
+          author: comment_author_n
+          content: comment_content_s
+          createdDate
+          deletedStatus: comment_deleted_i
 
-            commentAggregate {
+          reactions: reaction {
+            reactionlnkrAggregate {
               count
             }
+
+            reactionlnkr {
+              author: details_member_n
+            }
+          }
+
+          commentAggregate {
+            count
           }
         }
       }
+    }
 
     ... on Queststart {
       ballot_expiration_t
@@ -174,6 +174,11 @@ const PROPOSAL_QUERY = `
       details_title_s
       details_description_s
 
+      # details_usdAmount_a
+      # details_deferredPercX100_i
+
+      details_annualUsdSalary_a
+
       details_pegAmount_a
       details_rewardAmount_a
       details_voiceAmount_a
@@ -195,6 +200,7 @@ const PROPOSAL_QUERY = `
       }
 
       start {
+        docId
         details_startTime_t
       }
 
@@ -341,8 +347,8 @@ const PROPOSAL_QUERY = `
       }
 
       masterpolicy {
-          details_title_s
-        }
+        details_title_s
+      }
 
       dao {
         details_daoName_n
@@ -397,7 +403,7 @@ const PROPOSAL_QUERY = `
           abstain_votePower_a
         }
       }
-      
+
       parentcircle {
         ... on Circle {
           id: docId
@@ -617,7 +623,6 @@ const PROPOSAL_QUERY = `
       }
     }
     ... on Assignment {
-      details_usdSalaryValuePerPhase_a
       ballot_expiration_t
       details_assignee_n
 
@@ -625,6 +630,13 @@ const PROPOSAL_QUERY = `
       details_description_s
 
       details_periodCount_i
+      details_usdSalaryValuePerPhase_a
+      details_annualUsdSalary_a
+      details_pegSalaryPerPeriod_a
+      details_rewardSalaryPerPeriod_a
+      details_voiceSalaryPerPeriod_a
+      details_timeShareX100_i
+      details_approvedDeferredPercX100_i
 
       details_ballotQuorum_i
       details_ballotSupply_a
@@ -640,9 +652,16 @@ const PROPOSAL_QUERY = `
         }
       }
 
+      role {
+        id: docId
+        name: details_title_s
+      }
       salaryband {
-        details_annualUsdSalary_a
-        details_name_s
+        id: docId
+        name: details_name_s
+        annualAmount: details_annualUsdSalary_a
+        minDeferred: details_minDeferredX100_i
+
         assignment {
           role {
             system_nodeLabel_s
@@ -661,11 +680,7 @@ const PROPOSAL_QUERY = `
       claimed {
         docId
       }
-      details_pegSalaryPerPeriod_a
-      details_rewardSalaryPerPeriod_a
-      details_voiceSalaryPerPeriod_a
-      details_timeShareX100_i
-      details_approvedDeferredPercX100_i
+
       lastimeshare {
         details_timeShareX100_i
       }
@@ -980,10 +995,10 @@ const PROPOSAL_QUERY = `
     }
     ... on Votable {
       votetally {
-         docId
+        docId
 
         ... on VoteTally {
-           docId
+          docId
           pass_votePower_a
           fail_votePower_a
           abstain_votePower_a
@@ -1446,12 +1461,13 @@ export default {
       }
 
       if (this.proposal?.__typename === PROPOSAL_TYPE.ROLE) { // Role Assignment
-        const tier = this.tiers.find(tier => tier.label === this.proposal?.salaryband?.[0]?.details_name_s)
-        const archetype = this.archetypes.find(archetype => archetype.label === this.proposal?.salaryband?.[0]?.assignment?.[0]?.role?.[0]?.system_nodeLabel_s)
-        this.$store.commit('proposals/setRole', archetype)
+        const tier = this.tiers.find(tier => tier.label === (this.proposal?.salaryband?.[0]?.name || DEFAULT_TIER))
+        // const archetype = this.archetypes.find(archetype => archetype.label === this.proposal?.salaryband?.[0]?.assignment?.[0]?.role?.[0]?.system_nodeLabel_s)
+
+        this.$store.commit('proposals/setRole', { value: this.proposal?.role[0] })
         this.$store.commit('proposals/setTier', tier)
 
-        this.$store.commit('proposals/setAnnualUsdSalary', tier?.value?.annualAmount || 0)
+        this.$store.commit('proposals/setAnnualUsdSalary', parseFloat(tier.value.annualAmount.split(' ')[0]))
         this.$store.commit('proposals/setMinDeferred', tier?.value?.minDeferred || 0)
         this.$store.commit('proposals/setMinCommitment', 0)
 
@@ -1491,9 +1507,9 @@ export default {
         this.$store.commit('proposals/setUrl', this.proposal?.details_url_s)
         this.$store.commit('proposals/setStartPeriod', this.proposal?.start?.[0])
         this.$store.commit('proposals/setPeriodCount', this.proposal?.details_periodCount_i)
-        this.$store.commit('proposals/setPeg', this.proposal?.details_pegAmount_a.split(' ')[0])
-        this.$store.commit('proposals/setReward', this.proposal?.details_rewardAmount_a.split(' ')[0])
-        this.$store.commit('proposals/setVoice', this.proposal?.details_voiceAmount_a.split(' ')[0])
+        this.$store.commit('proposals/setPeg', this.proposal?.details_pegAmount_a?.split(' ')[0])
+        this.$store.commit('proposals/setReward', this.proposal?.details_rewardAmount_a?.split(' ')[0])
+        this.$store.commit('proposals/setVoice', this.proposal?.details_voiceAmount_a?.split(' ')[0])
         this.$store.commit('proposals/setStartPeriod', this.proposal?.start[0])
         this.$store.commit('proposals/setPeriodCount', this.proposal?.details_periodCount_i)
       }
diff --git a/src/pages/proposals/create/OptionsQuests.vue b/src/pages/proposals/create/OptionsQuests.vue
index 0527c514b..75502af1d 100644
--- a/src/pages/proposals/create/OptionsQuests.vue
+++ b/src/pages/proposals/create/OptionsQuests.vue
@@ -3,7 +3,9 @@ import { mapGetters } from 'vuex'
 
 export default {
   name: 'options-quests',
-  components: {},
+  components: {
+    LoadingSpinner: () => import('~/components/common/loading-spinner.vue')
+  },
 
   props: {},
 
diff --git a/src/pages/proposals/create/StepDuration.vue b/src/pages/proposals/create/StepDuration.vue
index cd7284603..fd7615706 100644
--- a/src/pages/proposals/create/StepDuration.vue
+++ b/src/pages/proposals/create/StepDuration.vue
@@ -224,7 +224,6 @@ widget
               q-icon(size="xs" name="fa fa-calendar-alt")
           q-date.bg-internal-bg.calendar.absolute.z-top(
             :options="isDateAvaiable"
-            @input="onDateChanged"
             @navigation="onDateNavigate"
             minimal="minimal"
             ref="calendar"
diff --git a/src/store/proposals/index.js b/src/store/proposals/index.js
index 9cbd631f1..c35c8e164 100644
--- a/src/store/proposals/index.js
+++ b/src/store/proposals/index.js
@@ -527,7 +527,7 @@ export default {
                 { label: 'time_share_x100', value: ['int64', draft.commitment] },
                 { label: 'deferred_perc_x100', value: ['int64', draft.deferred] },
 
-                { label: 'role', value: ['int64', draft.role.value.id] },
+                { label: 'role', value: ['int64', draft.role.value ? draft.role.value.id : draft.role.id] },
                 { label: 'start_period', value: ['int64', draft.startPeriod.docId] },
                 { label: 'period_count', value: ['int64', draft.periodCount] }
 
@@ -603,9 +603,12 @@ export default {
                 { label: 'title', value: ['string', draft.title] },
                 { label: 'description', value: ['string', draft.description] },
                 { label: 'url', value: ['string', draft.url] },
-                { label: 'annual_usd_salary', value: ['asset', `${parseFloat(draft.annualUsdSalary).toFixed(2)} USD`] },
-                { label: 'fulltime_capacity_x100', value: ['int64', Math.round(parseFloat(draft.roleCapacity) * 100)] },
-                { label: 'min_deferred_x100', value: ['int64', Math.round(parseFloat(draft.minDeferred))] },
+
+                { label: 'deferred_perc_x100', value: ['int64', draft?.deferred || 0] },
+                { label: 'usd_amount', value: ['asset', `${parseFloat(draft.usdAmount.toFixed(2))} USD`] },
+                // { label: 'annual_usd_salary', value: ['asset', `${parseFloat(draft.annualUsdSalary).toFixed(2)} USD`] },
+                // { label: 'fulltime_capacity_x100', value: ['int64', Math.round(parseFloat(draft.roleCapacity) * 100)] },
+                // { label: 'min_deferred_x100', value: ['int64', Math.round(parseFloat(draft.minDeferred))] },
 
                 { label: 'voice_amount', value: ['asset', `${parseFloat(draft.voice).toFixed(rootState.dao.settings.voiceTokenDecimals)} ${rootState.dao.settings.voiceToken}`] },
                 ...(rootState.dao.settings.rewardToken
@@ -728,18 +731,30 @@ export default {
           // Role assignment
           case PROPOSAL_TYPE.ROLE:
             content = [
+
               { label: 'content_group_label', value: ['string', 'details'] },
               { label: 'assignee', value: ['name', rootState.accounts.account] },
               { label: 'title', value: ['string', draft.title] },
               { label: 'description', value: ['string', draft.description] },
               { label: 'url', value: ['string', draft.url] },
-              // { label: 'annual_usd_salary', value: ['asset', `${parseFloat(draft.annualUsdSalary).toFixed(2)} USD`] },
+
+              ...(draft.tier.value.name !== DEFAULT_TIER
+                ? [
+                    { label: 'salary_band_id', value: ['int64', draft.tier.value.id] }
+                  ]
+                : [
+                    { label: 'annual_usd_salary', value: ['asset', `${parseFloat(draft.annualUsdSalary).toFixed(2)} USD`] },
+                    { label: 'fulltime_capacity_x100', value: ['int64', Math.round(parseFloat(draft.roleCapacity) * 100)] },
+                    { label: 'min_deferred_x100', value: ['int64', Math.round(parseFloat(draft.minDeferred))] }
+                  ]),
+
               { label: 'time_share_x100', value: ['int64', draft.commitment] },
               { label: 'deferred_perc_x100', value: ['int64', draft.deferred] },
-              { label: 'salary_band_id', value: ['int64', draft.tier.value.id] },
-              { label: 'role', value: ['int64', draft.role.value.id] },
+
+              { label: 'role', value: ['int64', draft.role.value ? draft.role.value.id : draft.role.id] },
               { label: 'start_period', value: ['int64', draft.startPeriod.docId] },
               { label: 'period_count', value: ['int64', draft.periodCount] }
+
             ]
             break
 
@@ -869,18 +884,28 @@ export default {
               { label: 'title', value: ['string', draft.title] },
               { label: 'description', value: ['string', draft.description] },
               { label: 'url', value: ['string', draft.url] },
-              { label: 'annual_usd_salary', value: ['asset', `${parseFloat(draft.annualUsdSalary).toFixed(2)} USD`] },
-              { label: 'fulltime_capacity_x100', value: ['int64', Math.round(parseFloat(draft.roleCapacity) * 100)] },
-              { label: 'min_deferred_x100', value: ['int64', Math.round(parseFloat(draft.minDeferred))] },
+
+              { label: 'deferred_perc_x100', value: ['int64', draft?.deferred || 0] },
+              { label: 'usd_amount', value: ['asset', `${parseFloat(draft.usdAmount.toFixed(2))} USD`] },
+              // { label: 'annual_usd_salary', value: ['asset', `${parseFloat(draft.annualUsdSalary).toFixed(2)} USD`] },
+              // { label: 'fulltime_capacity_x100', value: ['int64', Math.round(parseFloat(draft.roleCapacity) * 100)] },
+              // { label: 'min_deferred_x100', value: ['int64', Math.round(parseFloat(draft.minDeferred))] },
 
               { label: 'voice_amount', value: ['asset', `${parseFloat(draft.voice).toFixed(rootState.dao.settings.voiceTokenDecimals)} ${rootState.dao.settings.voiceToken}`] },
-              { label: 'reward_amount', value: ['asset', `${parseFloat(draft.reward).toFixed(rootState.dao.settings.rewardTokenDecimals)} ${rootState.dao.settings.rewardToken}`] },
-              { label: 'peg_amount', value: ['asset', `${parseFloat(draft.peg).toFixed(rootState.dao.settings.pegTokenDecimals)} ${rootState.dao.settings.pegToken}`] },
+              ...(rootState.dao.settings.rewardToken
+                ? [{ label: 'reward_amount', value: ['asset', `${parseFloat(draft.reward).toFixed(rootState.dao.settings.rewardTokenDecimals)} ${rootState.dao.settings.rewardToken}`] }]
+                : []
+              ),
+              ...(rootState.dao.settings.pegToken
+                ? [{ label: 'peg_amount', value: ['asset', `${parseFloat(draft.peg).toFixed(rootState.dao.settings.pegTokenDecimals)} ${rootState.dao.settings.pegToken}`] }]
+                : []
+              ),
 
               { label: 'start_period', value: ['int64', draft.startPeriod.docId] },
               { label: 'period_count', value: ['int64', draft.periodCount] },
-              { label: 'recipient', value: ['name', rootState.accounts.account] },
-              ...(draft.parentId ? [{ label: 'quest_start', value: ['int64', draft.parentId] }] : [])
+              { label: 'recipient', value: ['name', rootState.accounts.account] }
+              // ...(draft.circle ? [{ label: 'circle_id', value: ['int64', draft.circle.value] }] : []),
+              // ...(draft.parentQuest ? [{ label: 'quest_start', value: ['int64', draft.parentQuest.value] }] : [])
             ]
             break
 
@@ -890,18 +915,28 @@ export default {
               { label: 'title', value: ['string', draft.title] },
               { label: 'description', value: ['string', draft.description] },
               { label: 'url', value: ['string', draft.url] },
-              { label: 'annual_usd_salary', value: ['asset', `${parseFloat(draft.annualUsdSalary).toFixed(2)} USD`] },
-              { label: 'fulltime_capacity_x100', value: ['int64', Math.round(parseFloat(draft.roleCapacity) * 100)] },
-              { label: 'min_deferred_x100', value: ['int64', Math.round(parseFloat(draft.minDeferred))] },
+
+              { label: 'deferred_perc_x100', value: ['int64', draft?.deferred || 0] },
+              { label: 'usd_amount', value: ['asset', `${parseFloat(draft.usdAmount.toFixed(2))} USD`] },
+              // { label: 'annual_usd_salary', value: ['asset', `${parseFloat(draft.annualUsdSalary).toFixed(2)} USD`] },
+              // { label: 'fulltime_capacity_x100', value: ['int64', Math.round(parseFloat(draft.roleCapacity) * 100)] },
+              // { label: 'min_deferred_x100', value: ['int64', Math.round(parseFloat(draft.minDeferred))] },
 
               { label: 'voice_amount', value: ['asset', `${parseFloat(draft.voice).toFixed(rootState.dao.settings.voiceTokenDecimals)} ${rootState.dao.settings.voiceToken}`] },
-              { label: 'reward_amount', value: ['asset', `${parseFloat(draft.reward).toFixed(rootState.dao.settings.rewardTokenDecimals)} ${rootState.dao.settings.rewardToken}`] },
-              { label: 'peg_amount', value: ['asset', `${parseFloat(draft.peg).toFixed(rootState.dao.settings.pegTokenDecimals)} ${rootState.dao.settings.pegToken}`] },
+              ...(rootState.dao.settings.rewardToken
+                ? [{ label: 'reward_amount', value: ['asset', `${parseFloat(draft.reward).toFixed(rootState.dao.settings.rewardTokenDecimals)} ${rootState.dao.settings.rewardToken}`] }]
+                : []
+              ),
+              ...(rootState.dao.settings.pegToken
+                ? [{ label: 'peg_amount', value: ['asset', `${parseFloat(draft.peg).toFixed(rootState.dao.settings.pegTokenDecimals)} ${rootState.dao.settings.pegToken}`] }]
+                : []
+              ),
 
               { label: 'start_period', value: ['int64', draft.startPeriod.docId] },
               { label: 'period_count', value: ['int64', draft.periodCount] },
-              { label: 'recipient', value: ['name', rootState.accounts.account] },
-              ...(draft.parentId ? [{ label: 'quest_start', value: ['int64', draft.parentId] }] : [])
+              { label: 'recipient', value: ['name', rootState.accounts.account] }
+              // ...(draft.circle ? [{ label: 'circle_id', value: ['int64', draft.circle.value] }] : []),
+              // ...(draft.parentQuest ? [{ label: 'quest_start', value: ['int64', draft.parentQuest.value] }] : [])
             ]
             break
         }