diff --git a/CHANGELOG.md b/CHANGELOG.md
index f71bdabff..66da25c19 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,33 @@
 # Changelog
 
+## [2.11.0](https://github.com/hypha-dao/dho-web-client/compare/v2.10.0...v2.11.0) (2022-09-05)
+
+
+### Features
+
+* add cash claims flag ([#1490](https://github.com/hypha-dao/dho-web-client/issues/1490)) ([962e104](https://github.com/hypha-dao/dho-web-client/commit/962e104bd59e86bca749aa2c764498655f40c3db))
+* added "delete proposal" button to staging proposals ([#1520](https://github.com/hypha-dao/dho-web-client/issues/1520)) ([#1538](https://github.com/hypha-dao/dho-web-client/issues/1538)) ([7d48d6f](https://github.com/hypha-dao/dho-web-client/commit/7d48d6fcb94fb5f0d904f4bd2755d89167f91e55))
+* disabled cash claims for hypha ([#1531](https://github.com/hypha-dao/dho-web-client/issues/1531)) ([61f1261](https://github.com/hypha-dao/dho-web-client/commit/61f12619d0bfd45066b29db51bd1c15f8768baa0))
+* **explore page:** show dao creation wizard to hypha members only ([#1514](https://github.com/hypha-dao/dho-web-client/issues/1514)) ([925cf02](https://github.com/hypha-dao/dho-web-client/commit/925cf020b4c3c95b7a1e4eb2cda56d6a8682fc3e))
+* **proposals:** add pull interval to auto refresh ([#1529](https://github.com/hypha-dao/dho-web-client/issues/1529)) ([7163dad](https://github.com/hypha-dao/dho-web-client/commit/7163dada7cc512ceb9de80a3b79cdecf573a9bdc))
+
+
+### Bug Fixes
+
+* badge proposal details and formatting issues ([#1551](https://github.com/hypha-dao/dho-web-client/issues/1551)) ([33b755e](https://github.com/hypha-dao/dho-web-client/commit/33b755e035cc17202fbfdf9f52bcd130587dff14))
+* **changelog:** change relase notes for 2.10 ([#1546](https://github.com/hypha-dao/dho-web-client/issues/1546)) ([6eccb13](https://github.com/hypha-dao/dho-web-client/commit/6eccb13e7c86030e9bd41afbdb45468dc3d44c3a))
+* **configuration page:** remove pattern slip and disable announcement edit for non admins  ([#1530](https://github.com/hypha-dao/dho-web-client/issues/1530)) ([2ec524f](https://github.com/hypha-dao/dho-web-client/commit/2ec524f53217dffa05a90c63ae293f14be643c83))
+* current dao in left menu (dao switcher) has been hidden ([#1544](https://github.com/hypha-dao/dho-web-client/issues/1544)) ([#1565](https://github.com/hypha-dao/dho-web-client/issues/1565)) ([04dca98](https://github.com/hypha-dao/dho-web-client/commit/04dca98e9cfa64934f790b474e13f3f13fb5e46d))
+* enable deferred button for archived assignments [#1489](https://github.com/hypha-dao/dho-web-client/issues/1489) ([#1534](https://github.com/hypha-dao/dho-web-client/issues/1534)) ([a29b231](https://github.com/hypha-dao/dho-web-client/commit/a29b231aba7097fa69f65013ffb070d033dbe31b))
+* fix wrong titles and salary tag for search items ([#1513](https://github.com/hypha-dao/dho-web-client/issues/1513)) ([#1540](https://github.com/hypha-dao/dho-web-client/issues/1540)) ([c32b3aa](https://github.com/hypha-dao/dho-web-client/commit/c32b3aa0c19a24c1da10a961bd961fdec485c137))
+* fixed color for CTA buttons ([#1522](https://github.com/hypha-dao/dho-web-client/issues/1522)) ([#1560](https://github.com/hypha-dao/dho-web-client/issues/1560)) ([3f29e32](https://github.com/hypha-dao/dho-web-client/commit/3f29e32fa7183d20659844eb8efb4e25ae9b2bcc))
+* fixed filter on the search page, added missing filter types ([#1415](https://github.com/hypha-dao/dho-web-client/issues/1415)) ([#1537](https://github.com/hypha-dao/dho-web-client/issues/1537)) ([7ad7515](https://github.com/hypha-dao/dho-web-client/commit/7ad751570faea7797f4d1a477c68e80c2d7db75e))
+* fixed widgets links in home and organisation pages ([#1550](https://github.com/hypha-dao/dho-web-client/issues/1550)) ([#1564](https://github.com/hypha-dao/dho-web-client/issues/1564)) ([c600166](https://github.com/hypha-dao/dho-web-client/commit/c600166b8334046b9fd84333d018e779019c770f))
+* hide badge multiplier ([#1476](https://github.com/hypha-dao/dho-web-client/issues/1476)) ([#1535](https://github.com/hypha-dao/dho-web-client/issues/1535)) ([c498dbb](https://github.com/hypha-dao/dho-web-client/commit/c498dbb76549621b3a0afb36b47a5d93bd090560))
+* proposal description max length ([#1496](https://github.com/hypha-dao/dho-web-client/issues/1496)) ([20f0d46](https://github.com/hypha-dao/dho-web-client/commit/20f0d46bc11f8b5469e9db914e0ed81ee0bcbff6))
+* revert to claim all with multiple transaction ([#1509](https://github.com/hypha-dao/dho-web-client/issues/1509)) ([2e1ed55](https://github.com/hypha-dao/dho-web-client/commit/2e1ed55fb7f21c3b35f56ca418ba40d3e7499710))
+* warning about character max from description has been removed ([#1555](https://github.com/hypha-dao/dho-web-client/issues/1555)) ([#1563](https://github.com/hypha-dao/dho-web-client/issues/1563)) ([571f374](https://github.com/hypha-dao/dho-web-client/commit/571f37485c15985e0e5564af0a4bcebe16923f76))
+
 ## [2.10.1](https://github.com/hypha-dao/dho-web-client/compare/v2.10.0...v2.10.1) (2022-08-30)
 
 
@@ -23,4 +51,4 @@
 
 ### Bug Fixes
 
-* **configuration page:** remove pattern slip and disable announcement edit for non admins  ([#1530](https://github.com/hypha-dao/dho-web-client/issues/1530)) ([2ec524f](https://github.com/hypha-dao/dho-web-client/commit/2ec524f53217dffa05a90c63ae293f14be643c83))
\ No newline at end of file
+* **configuration page:** remove pattern slip and disable announcement edit for non admins  ([#1530](https://github.com/hypha-dao/dho-web-client/issues/1530)) ([2ec524f](https://github.com/hypha-dao/dho-web-client/commit/2ec524f53217dffa05a90c63ae293f14be643c83))
diff --git a/cypress.config.js b/cypress.config.js
new file mode 100644
index 000000000..c4c02afcb
--- /dev/null
+++ b/cypress.config.js
@@ -0,0 +1,18 @@
+const { defineConfig } = require('cypress')
+
+module.exports = defineConfig({
+  e2e: {
+    // We've imported your old cypress plugins here.
+    // You may want to clean this up later by importing these.
+    setupNodeEvents (on, config) {
+      return require('./cypress/plugins/index.js')(on, config)
+    }
+  },
+
+  component: {
+    devServer: {
+      framework: 'vue',
+      bundler: 'webpack'
+    }
+  }
+})
diff --git a/cypress.json b/cypress.json
deleted file mode 100644
index 0967ef424..000000000
--- a/cypress.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
diff --git a/cypress/integration/assignment.js b/cypress/e2e/assignment.cy.js
similarity index 100%
rename from cypress/integration/assignment.js
rename to cypress/e2e/assignment.cy.js
diff --git a/cypress/integration/roles.js b/cypress/e2e/roles.cy.js
similarity index 100%
rename from cypress/integration/roles.js
rename to cypress/e2e/roles.cy.js
diff --git a/cypress/support/component-index.html b/cypress/support/component-index.html
new file mode 100644
index 000000000..ac6e79fd8
--- /dev/null
+++ b/cypress/support/component-index.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width,initial-scale=1.0">
+    <title>Components App</title>
+  </head>
+  <body>
+    <div data-cy-root></div>
+  </body>
+</html>
\ No newline at end of file
diff --git a/cypress/support/index.js b/cypress/support/component.js
similarity index 78%
rename from cypress/support/index.js
rename to cypress/support/component.js
index d68db96df..53d9d15a2 100644
--- a/cypress/support/index.js
+++ b/cypress/support/component.js
@@ -1,5 +1,5 @@
 // ***********************************************************
-// This example support/index.js is processed and
+// This example support/component.js is processed and
 // loaded automatically before your test files.
 //
 // This is a great place to put global configuration and
@@ -18,3 +18,10 @@ import './commands'
 
 // Alternatively you can use CommonJS syntax:
 // require('./commands')
+
+import { mount } from 'cypress/vue2'
+
+Cypress.Commands.add('mount', mount)
+
+// Example use:
+// cy.mount(MyComponent)
\ No newline at end of file
diff --git a/cypress/support/e2e.js b/cypress/support/e2e.js
new file mode 100644
index 000000000..bfb896688
--- /dev/null
+++ b/cypress/support/e2e.js
@@ -0,0 +1,28 @@
+// ***********************************************************
+// This example support/index.js is processed and
+// loaded automatically before your test files.
+//
+// This is a great place to put global configuration and
+// behavior that modifies Cypress.
+//
+// You can change the location of this file or turn off
+// automatically serving support files with the
+// 'supportFile' configuration option.
+//
+// You can read more here:
+// https://on.cypress.io/configuration
+// ***********************************************************
+
+// Import commands.js using ES2015 syntax:
+import './commands'
+
+// Alternatively you can use CommonJS syntax:
+// require('./commands')
+
+Cypress.on('uncaught:exception', (err) => {
+  // returning false here prevents Cypress from
+  // failing the test
+//   cy.log('Cypress detected uncaught exception: ', err)
+//   console.log('Cypress detected uncaught ex/ception: ', err)
+  return false
+})
diff --git a/package.json b/package.json
index 5f2661768..3487fb839 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dho-web-client",
-  "version": "2.10.1",
+  "version": "2.11.0",
   "description": "Governance, payroll and treasury tools for distributed HUMAN organizations (DHO)",
   "productName": "Hypha DHO",
   "author": "Max <max@digitalscarcity.io>",
@@ -60,7 +60,7 @@
     "chromatic": "^5.8.2",
     "commitizen": "^4.2.5",
     "cross-fetch": "^3.1.4",
-    "cypress": "^7.3.0",
+    "cypress": "^10.7.0",
     "cz-conventional-changelog": "^3.3.0",
     "eslint": "7.24.0",
     "eslint-loader": "4.0.2",
diff --git a/src/components/assignments/assignment-suspend.vue b/src/components/assignments/assignment-suspend.vue
index cc2dcc81b..6c8d22641 100644
--- a/src/components/assignments/assignment-suspend.vue
+++ b/src/components/assignments/assignment-suspend.vue
@@ -1,9 +1,6 @@
 <script>
 export default {
   name: 'assignment-suspend',
-  components: {
-    InputField: () => import('~/components/common/input-field.vue')
-  },
   props: {
     owner: String,
     title: String,
@@ -29,7 +26,7 @@ export default {
           span.text-italic.q-pa-xs {{ title }}.
           span Please provide a reason.
       .col-12
-        input-field(v-model="reason" dense rounded outlined label="Reason" @click.stop)
+        q-input(v-model="reason" dense rounded outlined label="Reason" @click.stop)
         q-btn.full-width.q-mt-md(
           rounded
           unelevated
diff --git a/src/components/assignments/assignment-withdraw.vue b/src/components/assignments/assignment-withdraw.vue
index 983c488a1..6d6e9078c 100644
--- a/src/components/assignments/assignment-withdraw.vue
+++ b/src/components/assignments/assignment-withdraw.vue
@@ -5,9 +5,6 @@ export default {
   props: {
     submitting: Boolean
   },
-  components: {
-    InputField: () => import('~/components/common/input-field.vue')
-  },
   data () {
     return {
       notes: ''
@@ -28,7 +25,7 @@ export default {
           | you withdraw the assignment. Please provide a note below.
         .text-bold.text-italic.q-pt-xs WARNING: This action is irreversible.
       .col-12.col-lg-6
-        input-field(v-model="notes" dense rounded outlined label="Notes" @click.stop)
+        q-input(v-model="notes" dense rounded outlined label="Notes" @click.stop)
         q-btn.full-width.q-mt-md(
           rounded
           unelevated
diff --git a/src/components/common/input-field.stories.js b/src/components/common/input-field.stories.js
deleted file mode 100644
index 45f61697f..000000000
--- a/src/components/common/input-field.stories.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import '../../css/app.styl'
-
-import InputField from './input-field.vue'
-
-export default {
-  title: 'Common/ Input Field',
-  component: InputField,
-  argTypes: {}
-}
-
-const Template = (args, { argTypes }) => ({
-  props: Object.keys(argTypes),
-  components: { InputField },
-  template: `
-    <input-field v-bind="$props" />
-  `
-})
-
-export const Example = Template.bind({})
-// These are the params for the example story. You can all the params you want.
-Example.args = {
-
-}
-
-export const Base = Template.bind({})
diff --git a/src/components/common/input-field.vue b/src/components/common/input-field.vue
deleted file mode 100644
index efcb5e7b1..000000000
--- a/src/components/common/input-field.vue
+++ /dev/null
@@ -1,23 +0,0 @@
-<script>
-export default {
-  name: 'input-field',
-  props: {
-    rules: {
-      type: Array,
-      default: () => {}
-    },
-    color: {
-      type: String,
-      default: 'heading'
-    }
-  }
-}
-</script>
-
-<template lang="pug">
-q-input(ref="input"
-        :color = "color"
-        :rules = "rules"
-        v-bind = "{...$attrs, ...$props, ...$slots}"
-        v-on = "$listeners")
-</template>
diff --git a/src/components/contributions/token-multipliers.vue b/src/components/contributions/token-multipliers.vue
index bd97e89b5..e2e2711bb 100644
--- a/src/components/contributions/token-multipliers.vue
+++ b/src/components/contributions/token-multipliers.vue
@@ -6,9 +6,6 @@ export default {
     husd: Number,
     hvoice: Number,
     hypha: Number
-  },
-  components: {
-    InputField: () => import('~/components/common/input-field.vue')
   }
 }
 </script>
@@ -16,7 +13,7 @@ export default {
 <template lang="pug">
 .row.q-col-gutter-xs
   .col-6
-    input-field.bg-seeds.text-black(
+    q-input.bg-seeds.text-black(
       v-model="seeds"
       type="number"
       outlined
@@ -30,7 +27,7 @@ export default {
         )
     .hint Deferred Seeds
   .col-6
-    input-field.bg-liquid.text-black(
+    q-input.bg-liquid.text-black(
       v-model="husd"
       type="number"
       outlined
@@ -39,7 +36,7 @@ export default {
     )
     .hint HUSD
   .col-6
-    input-field.bg-liquid.text-black(
+    q-input.bg-liquid.text-black(
       v-model="hvoice"
       type="number"
       outlined
@@ -48,7 +45,7 @@ export default {
     )
     .hint HVOICE
   .col-6
-    input-field.bg-liquid.text-black(
+    q-input.bg-liquid.text-black(
       v-model="hypha"
       type="number"
       readonly
diff --git a/src/components/dao/settings-design.vue b/src/components/dao/settings-design.vue
index 53903daf6..d51aaf497 100644
--- a/src/components/dao/settings-design.vue
+++ b/src/components/dao/settings-design.vue
@@ -22,6 +22,11 @@ export default {
     isAdmin: {
       type: Boolean,
       default: false
+    },
+
+    isHypha: {
+      type: Boolean,
+      default: false
     }
   },
 
@@ -69,7 +74,20 @@ export default {
           title: 'organisationTitle',
           paragraph: 'organisationParagraph',
           state: ''
-        }
+        },
+        ...(this.isHypha
+          ? [
+              {
+                key: 'EXPLORE',
+                label: 'Explore',
+                image: 'exploreBackgroundImage',
+                title: 'exploreTitle',
+                paragraph: 'exploreParagraph',
+                state: ''
+              }
+            ]
+          : [])
+
       ],
 
       logoBase64: null,
@@ -678,7 +696,7 @@ ${backgroundImage
                                 color="accent"
                                 dense
                                 lazy-rules
-                                maxlength="140"
+                                maxlength="300"
                                 outlined
                                 placeholder="Max 140 characters"
                                 ref="nickname"
diff --git a/src/components/filters/filter-widget.vue b/src/components/filters/filter-widget.vue
index 2c3f03356..b7bb6a346 100644
--- a/src/components/filters/filter-widget.vue
+++ b/src/components/filters/filter-widget.vue
@@ -3,8 +3,7 @@ export default {
   name: 'filter-widget',
   components: {
     Chips: () => import('~/components/common/chips.vue'),
-    Widget: () => import('../common/widget.vue'),
-    InputField: () => import('~/components/common/input-field.vue')
+    Widget: () => import('../common/widget.vue')
   },
 
   watch: {
@@ -116,7 +115,7 @@ export default {
 <template lang="pug">
 widget(title="Filters")
       .row.items-center.justify-between.q-py-sm(v-if="showTextFilter")
-        input-field.text-filter.rounded-border.full-width(outlined v-model="textFilter" :placeholder="filterTitle" :debounce="debounce" dense)
+        q-input.text-filter.rounded-border.full-width(outlined v-model="textFilter" :placeholder="filterTitle" :debounce="debounce" dense)
           template(v-slot:append v-if="textFilter")
             q-icon(size="15px" name="fas fa-times" @click="clearSearchInput")
       .row.items-center.justify-between.q-py-sm(v-if="showViewSelector")
diff --git a/src/components/form/custom-period-input.vue b/src/components/form/custom-period-input.vue
index b1257cf96..cc037ce50 100644
--- a/src/components/form/custom-period-input.vue
+++ b/src/components/form/custom-period-input.vue
@@ -19,7 +19,7 @@ const secondsToInterval = (seconds) => {
 export default {
   name: 'custom-period-input',
   components: {
-    InputField: () => import('~/components/common/input-field.vue')
+
   },
   data: function () {
     return {
@@ -102,7 +102,7 @@ div.custom-period-input
   ) Custom period
 
   div(v-show="isActive").full-width.bg-primary.text-white.rounded-border.q-px-sm.relative-position
-      input-field(
+      q-input(
         :disable="disable"
         :value="valueFormated"
         @change='onChange'
diff --git a/src/components/form/period-select.vue b/src/components/form/period-select.vue
index bda651801..f396c04f0 100644
--- a/src/components/form/period-select.vue
+++ b/src/components/form/period-select.vue
@@ -6,7 +6,7 @@ export default {
   name: 'period-select',
   mixins: [validation],
   components: {
-    InputField: () => import('~/components/common/input-field.vue')
+
   },
   props: {
     value: { type: Object },
@@ -91,7 +91,7 @@ export default {
 </script>
 
 <template lang="pug">
-input-field(
+q-input(
   ref="model"
   v-model="form.model"
   :readonly="readonly"
diff --git a/src/components/form/phone-number.vue b/src/components/form/phone-number.vue
index 08dba8aa0..993f01cfe 100644
--- a/src/components/form/phone-number.vue
+++ b/src/components/form/phone-number.vue
@@ -7,7 +7,7 @@ export default {
   name: 'form-phone-number',
   mixins: [countriesPhoneCode, validation],
   components: {
-    InputField: () => import('~/components/common/input-field.vue')
+
   },
   props: {
     value: { type: String },
@@ -88,7 +88,7 @@ export default {
     :outlined="outlined"
     :style="{width:'50%'}"
   )
-  input-field(
+  q-input(
     ref="number"
     v-model="form.number"
     :label="`Phone number${required ? '*' : ''}`"
@@ -107,7 +107,7 @@ export default {
         border-radius: 4px 0 0 4px
         &:before
           border-right: none
-  /deep/.input-field
+  /deep/.q-input
     .q-field__inner
       .q-field__control
         border-radius: 0 4px 4px 0
diff --git a/src/components/form/text-input-toggle.vue b/src/components/form/text-input-toggle.vue
index ee18f32ea..ed1aaffe1 100644
--- a/src/components/form/text-input-toggle.vue
+++ b/src/components/form/text-input-toggle.vue
@@ -8,7 +8,7 @@ export default {
   name: 'text-input-toggle',
   mixins: [validation],
   components: {
-    InputField: () => import('~/components/common/input-field.vue')
+
   },
   props: {
     label: String,
@@ -68,7 +68,7 @@ div(class="text-input-toggle")
       q-btn.q-pa-xxs(round unelevated :icon="icon" color="primary" text-color="white" size="sm" :ripple="false" v-if="iconBackground")
       q-icon.chain-icon(:name="icon" :ripple="false" size='40px' v-else)
     .col
-      input-field.full-width.rounded-border.q-pb-none(
+      q-input.full-width.rounded-border.q-pb-none(
         dense
         outlined
         ref="text"
diff --git a/src/components/login/login-view.vue b/src/components/login/login-view.vue
index be3fb618d..a916a090b 100644
--- a/src/components/login/login-view.vue
+++ b/src/components/login/login-view.vue
@@ -5,8 +5,8 @@ export default {
   name: 'login-view',
   mixins: [validation],
   components: {
-    LoadingSpinner: () => import('~/components/common/loading-spinner.vue'),
-    InputField: () => import('~/components/common/input-field.vue')
+    LoadingSpinner: () => import('~/components/common/loading-spinner.vue')
+
   },
   computed: {
     ...mapGetters('accounts', ['loading'])
@@ -74,7 +74,7 @@ export default {
 
     .col-12(v-if="pkForm && pk")
         .text-h5.text-bold.input-label.q-mb-md Account
-        input-field(
+        q-input(
           ref="account"
           v-model="form.account"
           placeholder="Account"
@@ -87,7 +87,7 @@ export default {
           bg-color="white"
         )
         .text-h5.text-bold.input-label.q-mb-md Private key
-        input-field(
+        q-input(
           ref="privateKey"
           v-model="form.privateKey"
           type="password"
diff --git a/src/components/login/register-user-view.vue b/src/components/login/register-user-view.vue
index 72017f411..b30887038 100644
--- a/src/components/login/register-user-view.vue
+++ b/src/components/login/register-user-view.vue
@@ -10,8 +10,8 @@ export default {
   name: 'register-user-view',
   mixins: [validation, countriesPhoneCode],
   components: {
-    ProfilePicture: () => import('~/components/profiles/profile-picture.vue'),
-    InputField: () => import('~/components/common/input-field.vue')
+    ProfilePicture: () => import('~/components/profiles/profile-picture.vue')
+
   },
   data () {
     return {
@@ -56,7 +56,7 @@ export default {
     },
     isPhoneValid () {
       try {
-        const isValid = this.rules.phoneFormat(`${this.formStep1.countryCode.dialCode}${this.formStep1.smsNumber}`)
+        const isValid = this.rules.isPhoneNumber(`${this.formStep1.countryCode.dialCode}${this.formStep1.smsNumber}`)
         return isValid || 'Please type a valid phone'
       } catch (e) {
         return 'Please type a valid phone'
@@ -128,7 +128,7 @@ export default {
             .h-h1-signup.text-bold.color-primary information
             .h-b1-signup.color-secondary.q-mt-lg.q-mb-lg In order to participate in any decision making or apply for any role or receive any contribution you need to register and become a member. This is a two step process that begins with the account creation and ends with the enrollment in the DAO.
               .h-h7.q-mb-xs.q-pt-xxxl Account Name
-              input-field.q-mb-sm(
+              q-input.q-mb-sm(
                 ref="account"
                 v-model="formStep1.account"
                 bg-color="white"
@@ -143,7 +143,7 @@ export default {
                 dense
               )
               //- .h-b2-signup.color-primary.text-bold.input-label.q-mb-md Reason for membership
-              //- input-field.q-mb-sm(
+              //- q-input.q-mb-sm(
               //-   ref="reason"
               //-   v-model="formStep1.reason"
               //-   bg-color="white"
@@ -182,7 +182,7 @@ export default {
                     dense
                   )
                 .col
-                  input-field(
+                  q-input(
                     ref="smsNumber"
                     v-model="formStep1.smsNumber"
                     bg-color="white"
@@ -201,7 +201,7 @@ export default {
               .h-h1-signup.color-primary.text-bold keys
               .h-b1-signup.color-secondary.q-mt-lg.q-mb-lg It is essential to keep your keys in a safe place; never share your private keys with anyone.
               .h-h7.text-bold.input-label.q-mb-xxs Verification code
-              input-field.q-pa-none.full-width(
+              q-input.q-pa-none.full-width(
                 ref="code"
                 v-model="formStep2.code"
                 bg-color="white"
@@ -219,7 +219,7 @@ export default {
                 q-btn(flat color="primary" no-caps padding='0' @click="step = 'phoneNumber'").q-pa-none.q-ma-none.text-underline Check your phone number
 
               .h-h7.text-bold.input-label.q-mb-xxs.q-mt-md Public Key
-              input-field.q-mb-xl.full-width(
+              q-input.q-mb-xl.full-width(
                 ref="publicKey"
                 v-model="formStep2.publicKey"
                 placeholder="Public Key"
@@ -240,7 +240,7 @@ export default {
                     @click="onCopyToClipboard(formStep2.publicKey)"
                   )
               .h-h7.text-bold.input-label.q-mb-xxs Private Key
-              input-field.q-mb-md.full-width(
+              q-input.q-mb-md.full-width(
                   ref="privateKey"
                   v-model="formStep2.privateKey"
                   placeholder="Private Key"
diff --git a/src/components/profiles/contact-info.vue b/src/components/profiles/contact-info.vue
index 118ae0e47..2de347085 100644
--- a/src/components/profiles/contact-info.vue
+++ b/src/components/profiles/contact-info.vue
@@ -156,7 +156,7 @@ widget-editable(title="Contact Info"
         :toggle.sync = "toggles.phone"
         icon="fas fa-phone"
         label="Phone"
-        :validateRules="[toggles.phone && rules.required, form.phone && rules.phoneFormat]"
+        :validateRules="[toggles.phone && rules.required, form.phone && rules.isPhoneNumber]"
         :disable= "!editable"
         type= "tel" )
     .col
@@ -166,7 +166,7 @@ widget-editable(title="Contact Info"
         :toggle.sync = "toggles.email"
         icon="fas fa-envelope"
         label="Email"
-        :validateRules="[toggles.email && rules.required, form.email && rules.emailFormat]"
+        :validateRules="[toggles.email && rules.required, form.email && rules.isEmail]"
         :disable= "!editable"
         type= "email" )
 </template>
diff --git a/src/components/profiles/edit-dialog.vue b/src/components/profiles/edit-dialog.vue
index 5d79e967c..3f7f65683 100644
--- a/src/components/profiles/edit-dialog.vue
+++ b/src/components/profiles/edit-dialog.vue
@@ -85,7 +85,7 @@ const PROFILE_OPTIONS = [
 export default {
   name: 'edit-dialog',
   components: {
-    InputField: () => import('~/components/common/input-field.vue')
+
   },
   data () {
     return {
@@ -126,7 +126,7 @@ q-card.edit-dialog.bg-white.relative-position
             .section.bg-grey-2.q-pa-md(v-if="tab === opt.tab || $q.screen.lt.md")
               .text-h6.q-ml-sm.lt-md {{ opt.section }}
               template(v-for="val in opt.values")
-                input-field.q-ma-lg(
+                q-input.q-ma-lg(
                   outlined
                   v-model="val.value"
                   :label="val.label"
diff --git a/src/components/profiles/members-list.vue b/src/components/profiles/members-list.vue
index b3471468b..526a49a4e 100644
--- a/src/components/profiles/members-list.vue
+++ b/src/components/profiles/members-list.vue
@@ -37,9 +37,9 @@ export default {
 <template lang="pug">
 .members-list(ref="scrollContainer")
   q-infinite-scroll(@load="onLoad" :offset="250"  ref="scroll")
-    .row.q-gutter-md(:class="{ 'full-width': view === 'list', 'q-pr-xxs': view === 'list' }")
+    .row(:class="{ 'q-mr-md': view === 'list' }")
       template(v-for="member in members")
-        profile-card(:username="member.username" :joinedDate="member.joinedDate" :isApplicant = "member.isApplicant" :view="view" :key="member.hash")
+        profile-card.q-mr-md.q-mb-md.q-ml-none.q-mt-none(:style="'width: 297px'" :username="member.username" :joinedDate="member.joinedDate" :isApplicant = "member.isApplicant" :view="view" :key="member.hash")
     template(v-slot:loading)
       .row.justify-center.q-my-md
         loading-spinner(color="primary" size="40px")
diff --git a/src/components/profiles/profile-card.vue b/src/components/profiles/profile-card.vue
index a6cd51588..8e16b353b 100644
--- a/src/components/profiles/profile-card.vue
+++ b/src/components/profiles/profile-card.vue
@@ -14,8 +14,8 @@ export default {
     Chips: () => import('../common/chips.vue'),
     ProfilePicture: () => import('../profiles/profile-picture.vue'),
     WidgetEditable: () => import('../common/widget-editable.vue'),
-    ImageProcessor: () => import('~/components/form/image-processor'),
-    InputField: () => import('~/components/common/input-field.vue')
+    ImageProcessor: () => import('~/components/form/image-processor')
+
   },
 
   props: {
@@ -226,7 +226,7 @@ widget-editable(
   @onFail="resetForm"
   :savable= "savable"
   :class="{ 'full-width': list, 'cursor-pointer': !editButton && clickable }"
-  :style="{ 'width': card ? '302px' : 'inherit'}"
+  :style="{ 'width': card ? '325px' : 'inherit'}"
   @click.native="(!editButton && clickable) ? onClick() : null"
 )
   .row.items-arround.flex(v-if="!editable" :style="{ 'height': card ? '324px' : '80px' }")
@@ -288,7 +288,7 @@ widget-editable(
         prevent-white-space
       )
         //- img(:src="this.publicData.avatar" slot="placeholder")
-      input-field.full-width.rounded-border.q-mt-xl(
+      q-input.full-width.rounded-border.q-mt-xl(
         ref="name"
         v-model="form.name"
         label="Name"
diff --git a/src/components/profiles/wallet-adresses.vue b/src/components/profiles/wallet-adresses.vue
index 97e7f7b47..0720133ae 100644
--- a/src/components/profiles/wallet-adresses.vue
+++ b/src/components/profiles/wallet-adresses.vue
@@ -9,8 +9,8 @@ export default {
   mixins: [validation],
   components: {
     TextInputToggle: () => import('~/components/form/text-input-toggle.vue'),
-    WidgetEditable: () => import('~/components/common/widget-editable.vue'),
-    InputField: () => import('~/components/common/input-field.vue')
+    WidgetEditable: () => import('~/components/common/widget-editable.vue')
+
   },
 
   props: {
@@ -186,7 +186,7 @@ widget-editable(
         ref="eosAccount"
         type= "text"
       )
-          input-field.full-width.rounded-border.q-mt-xs(dense outlined
+          q-input.full-width.rounded-border.q-mt-xs(dense outlined
             :disable= "!editable"
             placeholder="memo"
             ref="eosMemo"
diff --git a/src/components/profiles/wallet-base.vue b/src/components/profiles/wallet-base.vue
index 7e057d0f6..92652bbf7 100644
--- a/src/components/profiles/wallet-base.vue
+++ b/src/components/profiles/wallet-base.vue
@@ -13,8 +13,8 @@ export default {
   components: {
     Widget: () => import('~/components/common/widget.vue'),
     TokenLogo: () => import('~/components/common/token-logo.vue'),
-    LoadingSpinner: () => import('~/components/common/loading-spinner.vue'),
-    InputField: () => import('~/components/common/input-field.vue')
+    LoadingSpinner: () => import('~/components/common/loading-spinner.vue')
+
   },
 
   props: {
@@ -135,7 +135,7 @@ widget.wallet-base(:more="more" :no-title="noTitle" morePosition="top" title="Wa
                 q-tooltip(:content-style="{ 'font-size': '1em' }" anchor="top middle" self="bottom middle") {{ getFormatedTokenAmount(item.value, Number.MAX_VALUE) }}
     .redeem-section.q-pt-xs(v-if="canRedeem")
       .row-md.justify-center
-        input-field.full-width.rounded-border(
+        q-input.full-width.rounded-border(
           :rules="[rules.greaterThan(0), rules.lessOrEqualThan(pegToken.amount)]"
           dense
           min="1"
diff --git a/src/components/proposals/comment-input.vue b/src/components/proposals/comment-input.vue
index a6ef10f6c..7a9f423a5 100644
--- a/src/components/proposals/comment-input.vue
+++ b/src/components/proposals/comment-input.vue
@@ -3,8 +3,8 @@
 export default {
   name: 'comments-input',
   components: {
-    EmojiPicker: () => import('~/components/form/emoji-picker.vue'),
-    InputField: () => import('~/components/common/input-field.vue')
+    EmojiPicker: () => import('~/components/form/emoji-picker.vue')
+
   },
 
   data () {
@@ -51,7 +51,7 @@ export default {
 
 <template lang="pug">
 .comments-input.relative-position
-  input-field.rounded-border(
+  q-input.rounded-border(
       :debounce="200"
       @keyup.enter="createComment"
       bg-color="white"
diff --git a/src/components/proposals/comment-item.vue b/src/components/proposals/comment-item.vue
index 354416308..ae28ff7bb 100644
--- a/src/components/proposals/comment-item.vue
+++ b/src/components/proposals/comment-item.vue
@@ -1,5 +1,5 @@
 <script>
-import { mapActions } from 'vuex'
+import { mapActions, mapGetters } from 'vuex'
 import { date } from 'quasar'
 
 export default {
@@ -75,6 +75,8 @@ export default {
   },
 
   computed: {
+    ...mapGetters('accounts', ['account']),
+
     hasMore () { return this.commentAggregate?.count > 0 },
 
     hasLiked () { return this.reactions ? this.reactions.users?.includes(this.author) : false },
@@ -100,6 +102,10 @@ export default {
       if (second > 0) return `${second} second${second > 1 ? 's' : ''} ago`
 
       return ''
+    },
+
+    isCreator () {
+      return this.author === this.account
     }
 
   },
@@ -165,6 +171,17 @@ export default {
                     size="sm"
                     unelevated
                 )
+                q-btn(
+                    @click="$emit('delete', id)"
+                    v-if="isCreator"
+                    color="primary"
+                    flat
+                    icon="fa fa-trash"
+                    padding="12px"
+                    rounded
+                    size="sm"
+                    unelevated
+                )
     .row.q-mt-md
         p {{ content }}
 
@@ -198,6 +215,7 @@ export default {
                 @create="(data) => $emit('create', data)"
                 @like="$emit('like', comment.id)"
                 @unlike="$emit('unlike', comment.id)"
+                @delete="$emit('delete', comment.id)"
                 @load-comment="(id) => $emit('load-comment', id)"
                 v-bind='comment'
             )
diff --git a/src/components/proposals/comments-widget.vue b/src/components/proposals/comments-widget.vue
index cd7c15e81..ba8f26c37 100644
--- a/src/components/proposals/comments-widget.vue
+++ b/src/components/proposals/comments-widget.vue
@@ -32,6 +32,7 @@ widget.comments-widget(:title="`Comments (${comments.length})`")
             @create="(data) => $emit('create', data)"
             @like="(id) => $emit('like', id)"
             @unlike="(id) => $emit('unlike', id)"
+            @delete="(id) => $emit('delete', id)"
             @load-comment="(id) => $emit('load-comment', id)"
             v-bind='comment'
         )
diff --git a/src/components/proposals/proposal-card.vue b/src/components/proposals/proposal-card.vue
index 8a2a4a99c..1fe47ca68 100644
--- a/src/components/proposals/proposal-card.vue
+++ b/src/components/proposals/proposal-card.vue
@@ -24,7 +24,9 @@ export default {
     /**
      * The data to fill the proposal card with
      */
-    proposal: Object
+    proposal: Object,
+
+    updateProposals: Promise
   },
   mounted () {
     this.counterdown = setInterval(() => {
@@ -84,7 +86,7 @@ export default {
       } else if (this.proposal.cmntsect[0] === undefined) {
         return 0 // No comment section
       }
-      return this.proposal.cmntsect[0].comment.length
+      return this.proposal.cmntsect[0].comment.filter(comment => comment.deletedStatus !== 1).length
     }
   }
 }
@@ -104,12 +106,12 @@ widget.cursor-pointer.card(
   noPadding
   :background="background"
   :class="{ 'full-width': list}"
-  @click.native="$router.push({ name: 'proposal-detail', params: {docId} })"
+  @click.native="$router.push({ name: 'proposal-detail', params: {docId, updateProposals} })"
 )
   .row.justify-center.items-center
     div(
       :style="{ 'min-height': card ? '344px': '145px', 'max-width': card ? '302px' : '940px', 'full-width': list, 'background': 'white' }"
-      :class="{'q-px-lg': card, 'q-py-xl': card, 'q-px-xl': list, 'col': list}"
+      :class="{'q-px-lg': card, 'q-py-xl': card, 'q-px-xl': list, 'col': list, 'flex': list, 'column': list, 'justify-center': list}"
       ).round-corners.overflow-hidden.relative
       q-skeleton(v-if="proposal.loading").absolute-full.round-corners
 
diff --git a/src/components/proposals/proposal-list.vue b/src/components/proposals/proposal-list.vue
index a6f053c6f..86adab3fc 100644
--- a/src/components/proposals/proposal-list.vue
+++ b/src/components/proposals/proposal-list.vue
@@ -28,7 +28,9 @@ export default {
     /**
      * Whether the card is a list style or card style
      */
-    view: String
+    view: String,
+
+    updateProposals: Promise
   },
   computed: {
     ...mapGetters('dao', ['daoSettings'])
@@ -44,6 +46,7 @@ export default {
 .proposal-list.row(:class="{'q-mr-md' : view === 'list'}")
   .template(v-for="p in proposals" :class="(view === 'card') ? 'col-4' : 'col-12'")
     proposal-card.q-mr-md.q-mb-md(
+      :updateProposals="updateProposals"
       :view="view"
       :key="p.hash"
       :proposal="p"
diff --git a/src/components/proposals/proposal-view.vue b/src/components/proposals/proposal-view.vue
index fe70469bc..e2d0de631 100644
--- a/src/components/proposals/proposal-view.vue
+++ b/src/components/proposals/proposal-view.vue
@@ -224,7 +224,7 @@ widget.proposal-view.q-mb-sm
             flat round size="sm"
             icon="fas fa-pen"
             color="primary"
-            v-if="ownAssignment && status === 'approved' || 'archived'"
+            v-if="ownAssignment && status === 'approved' || status === 'archived'"
             @click="showDefferredPopup = true; showCommitPopup = false")
               q-tooltip Edit
     .col.bg-internal-bg.rounded-border.q-mr-xs(v-if="icon")
diff --git a/src/components/proposals/voting.vue b/src/components/proposals/voting.vue
index 41ea682e3..b416b5f12 100644
--- a/src/components/proposals/voting.vue
+++ b/src/components/proposals/voting.vue
@@ -28,7 +28,9 @@ export default {
     staging: Boolean,
     submitting: Boolean,
     fixed: Boolean,
-    activeButtons: Boolean
+    activeButtons: Boolean,
+    proposal: Object,
+    isCreator: Boolean
   },
   beforeMount () {
     this.counterdown = setInterval(() => {
@@ -62,7 +64,7 @@ export default {
   },
 
   computed: {
-    ...mapGetters('accounts', ['isMember']),
+    ...mapGetters('accounts', ['isMember', 'account']),
 
     background () {
       if (this.suspend || this.stagingToSuspend || this.withdraw) return 'primary'
@@ -105,6 +107,15 @@ export default {
       }
       if (this.isApproved) return 'Accepted'
       return 'Vote'
+    },
+
+    isEditable () {
+      return this.isCreator && (
+        this.proposal.__typename === 'Assignment' ||
+        this.proposal.__typename === 'Badge' ||
+        this.proposal.__typename === 'Assignbadge' ||
+        this.proposal.__typename === 'Role'
+      ) && this.proposal.details_state_s === 'approved'
     }
   },
 
@@ -118,6 +129,9 @@ export default {
       this.isVoting = false
       this.$emit('voting')
     },
+    onEdit () {
+      this.$emit('on-edit')
+    },
     onActive () {
       this.$emit('on-active')
     },
@@ -179,6 +193,7 @@ widget(:title="widgetTitle" noPadding :background="background" :textColor="isVot
         q-btn.q-mt-md.full-width.text-bold(v-if="canBeApply && activeButtons" no-caps rounded unelevated color="white" text-color="positive" @click="onApply") Apply
         q-btn.full-width.text-bold.q-mt-xs.h-btn2(v-if="canBeSuspended && !isProposed && activeButtons && !isOwnProposal" no-caps rounded flat unelevated color="white" text-color="white" @click="suspend = true" padding="5px") Suspend assignment
           q-tooltip Invoke a suspension proposal for this activity
+        q-btn.q-mt-xs.full-width.h-btn2(v-if="isEditable" no-caps unelevated flat text-color="white" padding="5px" @click="onEdit" rounded) Edit
         q-btn.q-mt-xs.full-width.h-btn2(v-if="canBeWithdraw" no-caps unelevated flat text-color="white" padding="5px" @click="withdraw = true" rounded) Withdraw assignment
     .column.q-mb-xxl(v-if="!isVotingExpired && !isVoting && !isApproved")
       .row.justify-center
diff --git a/src/layouts/MultiDhoLayout.vue b/src/layouts/MultiDhoLayout.vue
index 71bf2d28e..edd4272a7 100644
--- a/src/layouts/MultiDhoLayout.vue
+++ b/src/layouts/MultiDhoLayout.vue
@@ -13,8 +13,7 @@ export default {
     ProfileSidebar: () => import('~/components/navigation/profile-sidebar.vue'),
     ProfileSidebarGuest: () => import('~/components/navigation/profile-sidebar-guest.vue'),
     TopNavigation: () => import('~/components/navigation/top-navigation.vue'),
-    LoadingSpinner: () => import('~/components/common/loading-spinner.vue'),
-    InputField: () => import('~/components/common/input-field.vue')
+    LoadingSpinner: () => import('~/components/common/loading-spinner.vue')
   },
   props: {
     dho: Object,
@@ -234,7 +233,7 @@ q-layout(:style="{ 'min-height': 'inherit' }" :view="'lHr Lpr lFr'" ref="layout"
                   .row.justify-end.items-center
                     q-btn.q-mr-xs(:to="{ name: 'configuration' }" unelevated rounded padding="12px" icon="fas fa-cog"  size="sm" :color="isActiveRoute('configuration') ? 'primary' : 'white'" :text-color="isActiveRoute('configuration') ? 'white' : 'primary'" )
                     q-btn(:to="{ name: 'support' }" unelevated rounded padding="12px" icon="far fa-question-circle"  size="sm" color="white" text-color="primary")
-                    input-field.q-ml-md.search(
+                    q-input.q-ml-md.search(
                       v-if="$q.screen.gt.sm"
                       v-model="searchInput"
                       placeholder="Search the whole DAO"
@@ -272,7 +271,6 @@ q-layout(:style="{ 'min-height': 'inherit' }" :view="'lHr Lpr lFr'" ref="layout"
 .content
   border-radius 26px
 .scroll-background
-  padding-top 20px
   padding-bottom 10px
 .scroll-height
   height 100vh
diff --git a/src/layouts/ProposalLayout.vue b/src/layouts/ProposalLayout.vue
index 08554ced9..b73ff2bef 100644
--- a/src/layouts/ProposalLayout.vue
+++ b/src/layouts/ProposalLayout.vue
@@ -62,7 +62,7 @@ q-layout(:style="{ 'min-height': 'inherit' }" :view="'lHr Lpr lFr'" ref="layout"
   q-header.bg-white
     top-navigation(:profile="profile" @toggle-sidebar="right = true")
   q-page-container.bg-white.window-height(:class="{ 'q-pr-md': $q.screen.gt.sm }")
-    .scroll-background.bg-internal-bg.content.full-height(:style="{ 'padding-bottom': '210px' }")
+    .bg-internal-bg.content.full-height(:style="{ 'padding-bottom': '210px' }")
       q-scroll-area.full-height(:thumb-style=" { 'border-radius': '6px' }")
         .row.full-width
           .col.margin-min
@@ -81,9 +81,6 @@ q-layout(:style="{ 'min-height': 'inherit' }" :view="'lHr Lpr lFr'" ref="layout"
   border-top-left-radius 26px
   border-top-right-radius 26px
 
-.scroll-background
-  padding-top 20px
-
 .scroll-height
   height 100vh
 
diff --git a/src/mixins/validation.js b/src/mixins/validation.js
index 3c48928e5..10383ee08 100644
--- a/src/mixins/validation.js
+++ b/src/mixins/validation.js
@@ -6,15 +6,16 @@ export const validation = {
   data () {
     return {
       rules: {
-        emailFormat: (val) => /^(?=[a-zA-Z0-9@._%+-]{6,254}$)[a-zA-Z0-9._%+-]{1,64}@(?:[a-zA-Z0-9-]{1,63}\.){1,8}[a-zA-Z]{2,63}$/.test(val.toLowerCase()) || 'Invalid email format',
-        phoneFormat: (val) => isValidPhoneNumber(val.toLowerCase()) || 'Invalid phone format',
+        isEmail: (val) => /^(?=[a-zA-Z0-9@._%+-]{6,254}$)[a-zA-Z0-9._%+-]{1,64}@(?:[a-zA-Z0-9-]{1,63}\.){1,8}[a-zA-Z]{2,63}$/.test(val.toLowerCase()) || 'Invalid email format',
+        isPhoneNumber: (val) => isValidPhoneNumber(val.toLowerCase()) || 'Invalid phone format',
+        isDiscordUsername: (val) => val ? /^.{3,32}#[0-9]{4}$/gmi.test(val.toLowerCase()) || 'Invalid discord format. Ex. Regen#0001' : true,
         accountFormat: val => /^([a-z]|[1-5]|.){1,12}$/.test(val.toLowerCase()) || 'The account must contain 12 lowercase characters only, number from 1 to 5 or a period.',
         accountFormatBasic: val => /^([a-z]|[1-5]){12}$/.test(val.toLowerCase()) || 'The account must contain 12 lowercase characters only and number from 1 to 5.',
         accountLength: val => val.length === 12 || 'The account must contain 12 characters',
         maxLength: val => value => value.length <= val || `This field must contain less than ${val} characters`,
-        isAccountAvailable: async account => (await this.isAccountFree(account.toLowerCase())) || `The account "${account}" already exists`,
-        accountExists: async account => !(await this.isAccountFree(account.toLowerCase())) || `The account "${account}" doesn't exist`,
-        isTokenAvailable: async token => (await this.isTokenFree(token.toUpperCase())) || `The token "${token}" already exists`,
+        isAccountAvailable: async account => (await this.isAccountAvailable(account.toLowerCase())) || `The account "${account}" already exists`,
+        accountExists: async account => !(await this.isAccountAvailable(account.toLowerCase())) || `The account "${account}" doesn't exist`,
+        isTokenAvailable: async token => (await this.isTokenAvailable(token.toUpperCase())) || `The token "${token}" already exists. Please choose another name.`,
         required: val => !!val || 'This field is required',
         requiredIf: cond => val => {
           if (!cond) {
@@ -34,8 +35,8 @@ export const validation = {
     }
   },
   methods: {
-    ...mapActions('accounts', ['isAccountFree']),
-    ...mapActions('dao', ['isTokenFree']),
+    ...mapActions('accounts', ['isAccountAvailable']),
+    ...mapActions('dao', ['isTokenAvailable']),
     async validate (form) {
       if (!form) return true
       let valid = true
diff --git a/src/pages/dho/Configuration.vue b/src/pages/dho/Configuration.vue
index 4fa7b733a..2530754f1 100644
--- a/src/pages/dho/Configuration.vue
+++ b/src/pages/dho/Configuration.vue
@@ -60,7 +60,11 @@ const defaultSettings = {
 
   organisationBackgroundImage: '',
   organisationTitle: '',
-  organisationParagraph: ''
+  organisationParagraph: '',
+
+  exploreBackgroundImage: '',
+  exploreTitle: '',
+  exploreParagraph: ''
 
 }
 
@@ -139,7 +143,11 @@ export default {
 
         organisationBackgroundImage: this.daoSettings?.organisationBackgroundImage ? this.daoSettings?.organisationBackgroundImage : defaultSettings.organisationBackgroundImage,
         organisationTitle: this.daoSettings?.organisationTitle ? this.daoSettings?.organisationTitle : defaultSettings.organisationTitle,
-        organisationParagraph: this.daoSettings?.organisationParagraph ? this.daoSettings?.organisationParagraph : defaultSettings.organisationParagraph
+        organisationParagraph: this.daoSettings?.organisationParagraph ? this.daoSettings?.organisationParagraph : defaultSettings.organisationParagraph,
+
+        exploreBackgroundImage: this.daoSettings?.exploreBackgroundImage ? this.daoSettings?.exploreBackgroundImage : defaultSettings.exploreBackgroundImage,
+        exploreTitle: this.daoSettings?.exploreTitle ? this.daoSettings?.exploreTitle : defaultSettings.exploreTitle,
+        exploreParagraph: this.daoSettings?.exploreParagraph ? this.daoSettings?.exploreParagraph : defaultSettings.exploreParagraph
 
       }
 
diff --git a/src/pages/dho/Explore.vue b/src/pages/dho/Explore.vue
index f1ffab746..0bfe6a193 100644
--- a/src/pages/dho/Explore.vue
+++ b/src/pages/dho/Explore.vue
@@ -17,7 +17,7 @@ export default {
   },
   data () {
     return {
-      optionArray: ['Creation date ascending', 'Creation date descending', 'Sort alphabetically'],
+      optionArray: [{ label: 'Sort by', disable: true }, 'Creation date ascending', 'Creation date descending', 'Alphabetically'],
       isShowingExploreBanner: true,
       sort: '',
       daoName: '',
@@ -65,9 +65,9 @@ export default {
 
     banner () {
       return {
-        title: 'Discover the Hypha DAO network',
-        description: 'Welcome to the global DAO directory! Click on any card to open the DAO and to take a look under the hood. You can learn more about them, apply as a member or simply take a look around.',
-        background: ipfsy(this.daoSettings.dashboardBackgroundImage),
+        title: this.daoSettings.exploreTitle || 'Discover the Hypha DAO network',
+        description: this.daoSettings.exploreParagraph || 'Welcome to the global DAO directory! Click on any card to open the DAO and to take a look under the hood. You can learn more about them, apply as a member or simply take a look around.',
+        background: ipfsy(this.daoSettings.exploreBackgroundImage),
         color: this.daoSettings.primaryColor,
         pattern: this.daoSettings.pattern,
         patternColor: this.daoSettings.patternColor,
@@ -75,13 +75,13 @@ export default {
       }
     },
     order () {
-      if (this.optionArray[0] === this.sort) {
+      if (this.optionArray[1] === this.sort) {
         return { asc: 'createdDate' }
       }
-      if (this.optionArray[1] === this.sort) {
+      if (this.optionArray[2] === this.sort) {
         return { desc: 'createdDate' }
       }
-      if (this.optionArray[2] === this.sort) {
+      if (this.optionArray[3] === this.sort) {
         return { asc: 'details_daoName_n' }
       }
       return null
@@ -168,7 +168,7 @@ export default {
           filterTitle="Search DHOs"
           :optionArray.sync="optionArray"
           :showToggle="false"
-          :defaultOption="0"
+          :defaultOption="1"
           :showViewSelector="false"
           :showCircle="false"
           @update:sort="updateSort"
diff --git a/src/pages/dho/Members.vue b/src/pages/dho/Members.vue
index 549150f7b..f36d66e5a 100644
--- a/src/pages/dho/Members.vue
+++ b/src/pages/dho/Members.vue
@@ -135,7 +135,7 @@ export default {
       sort: '',
       textFilter: null,
       circle: '',
-      optionArray: ['Sort by join date descending', 'Sort by join date ascending', 'Sort Alphabetically (A-Z)'],
+      optionArray: [{ label: 'Sort by', disable: true }, 'Join date descending', 'Join date ascending', 'Alphabetically (A-Z)'],
       circleArray: ['All circles', 'Circle One'],
       showApplicants: false
     }
@@ -382,10 +382,11 @@ export default {
   .row.full-width.q-py-md
     .col-9
       members-list(:members="members" :view="view" @loadMore="onLoadMoreMembers" ref="scroll")
-    .col-3.q-pl-sm
+    .col-3
       filter-widget.sticky(:view.sync="view",
       :toggle.sync="showApplicants",
-      :toggleDefault="false"
+      :toggleDefault="false",
+      :defaultOption="1",
       :sort.sync="sort",
       :textFilter.sync="textFilter",
       :circle.sync="circle",
diff --git a/src/pages/dho/Treasury.vue b/src/pages/dho/Treasury.vue
index b653450f6..b0512b1c3 100644
--- a/src/pages/dho/Treasury.vue
+++ b/src/pages/dho/Treasury.vue
@@ -256,7 +256,7 @@ q-page.page-treasury
   //-     q-card-section.text-center
   //-       .text-h6 Endorse payment {{ `#${endorseForm.paymentId}` }}
   //-     q-card-section
-  //-       input-field.q-mb-sm(
+  //-       q-input.q-mb-sm(
   //-         ref="amount"
   //-         v-model="endorseForm.amount"
   //-         label="Amount"
@@ -264,7 +264,7 @@ q-page.page-treasury
   //-         disable
   //-         dense
   //-       )
-  //-       input-field(
+  //-       q-input(
   //-         ref="comment"
   //-         v-model="endorseForm.comment"
   //-         label="Comment"
@@ -291,7 +291,7 @@ q-page.page-treasury
   //-     q-card-section.text-center
   //-       .text-h6 New payment for #[strong {{ paymentRequestor }}]
   //-     q-card-section
-  //-       input-field(
+  //-       q-input(
   //-         ref="amount"
   //-         v-model="newTrxForm.amount"
   //-         label="Amount"
@@ -310,7 +310,7 @@ q-page.page-treasury
   //-         :rules="[rules.required]"
   //-         lazy-rules
   //-       )
-  //-       input-field(
+  //-       q-input(
   //-         ref="trxId"
   //-         v-model="newTrxForm.trxId"
   //-         label="Trx ID"
@@ -319,7 +319,7 @@ q-page.page-treasury
   //-         outlined
   //-         dense
   //-       )
-  //-       input-field(
+  //-       q-input(
   //-         ref="comment"
   //-         v-model="newTrxForm.comment"
   //-         label="Comment"
diff --git a/src/pages/onboarding/create.vue b/src/pages/onboarding/create.vue
index c7b1d1bfd..2230e41ad 100644
--- a/src/pages/onboarding/create.vue
+++ b/src/pages/onboarding/create.vue
@@ -126,8 +126,8 @@ export default {
     CustomPeriodInput: () => import('~/components/form/custom-period-input.vue'),
     InputFileIpfs: () => import('~/components/ipfs/input-file-ipfs.vue'),
     IpfsImageViewer: () => import('~/components/ipfs/ipfs-image-viewer.vue'),
-    Widget: () => import('~/components/common/widget.vue'),
-    InputField: () => import('~/components/common/input-field.vue')
+    Widget: () => import('~/components/common/widget.vue')
+
   },
 
   data () {
@@ -283,7 +283,7 @@ export default {
         .row.full-width.justify-between.q-mt-sm
           .col-12
             label.h-label Organization name
-            input-field.q-mt-xs.rounded-border(
+            q-input.q-mt-xs.rounded-border(
               :rules="[rules.required]"
               dense
               lazy-rules="ondemand"
@@ -295,7 +295,7 @@ export default {
             )
           .col-12
             label.h-label Organization purpose
-            input-field.q-mt-xs.rounded-border(
+            q-input.q-mt-xs.rounded-border(
               :input-style="{ 'resize': 'none' }"
               :rules="[rules.required]"
               dense
@@ -314,7 +314,7 @@ export default {
         .row.full-width.justify-between.q-mt-sm
           .col-12.q-pr-xs
             label.h-label Name your Token
-            input-field.q-mt-xs.rounded-border(
+            q-input.q-mt-xs.rounded-border(
                   :debounce="200"
                   :rules="[rules.required, rules.isTokenAvailable]"
                   bg-color="white"
@@ -336,7 +336,7 @@ export default {
         //- .row.full-width.justify-between.q-mt-sm
         //-   .col-8.q-pr-xs
         //-     label.h-label Symbol
-        //-     input-field.q-mt-xs.rounded-border(
+        //-     q-input.q-mt-xs.rounded-border(
         //-           :debounce="200"
         //-           :rules="[rules.required]"
         //-           bg-color="white"
@@ -374,7 +374,7 @@ export default {
         //- .row.full-width.justify-between
         //-   .col-6.q-pr-xs
         //-     label.h-label Total amount
-        //-     input-field.q-mt-xs.rounded-border(
+        //-     q-input.q-mt-xs.rounded-border(
         //-           :debounce="200"
         //-           :rules="[rules.required]"
         //-           bg-color="white"
@@ -389,7 +389,7 @@ export default {
         //-         )
         //-   .col-6
         //-     label.h-label Value
-        //-     input-field.q-mt-xs.rounded-border(
+        //-     q-input.q-mt-xs.rounded-border(
         //-           :debounce="200"
         //-           :rules="[rules.required]"
         //-           bg-color="white"
@@ -412,7 +412,7 @@ export default {
         //-   .row.full-width.justify-between.q-mt-sm
         //-     .col-8.q-pr-xs
         //-       label.h-label Symbol
-        //-       input-field.q-mt-xs.rounded-border(
+        //-       q-input.q-mt-xs.rounded-border(
         //-             :debounce="200"
         //-             :rules="[rules.required]"
         //-             bg-color="white"
@@ -456,7 +456,7 @@ export default {
         //-   .row.full-width.justify-between.q-mt-sm
         //-     .col-8.q-pr-xs
         //-       label.h-label Symbol
-        //-       input-field.q-mt-xs.rounded-border(
+        //-       q-input.q-mt-xs.rounded-border(
         //-             :debounce="200"
         //-             :rules="[rules.required]"
         //-             bg-color="white"
@@ -513,7 +513,7 @@ export default {
           .row.full-width.justify-between.q-col-gutter-xs
             .col-3.q-pr-xs
               label.h-label Name
-              input-field.q-mt-xs.q-pa-none.rounded-border(
+              q-input.q-mt-xs.q-pa-none.rounded-border(
                     :debounce="200"
                     :rules="[rules.required]"
                     bg-color="white"
@@ -528,7 +528,7 @@ export default {
                   )
             .col-3
               label.h-label Email
-              input-field.q-mt-xs.q-pa-none.rounded-border(
+              q-input.q-mt-xs.q-pa-none.rounded-border(
                     :debounce="200"
                     :rules="[rules.required]"
                     bg-color="white"
@@ -543,7 +543,7 @@ export default {
                   )
             .col-3
               label.h-label Telos/SEEDS account
-              input-field.q-mt-xs.q-pa-none.rounded-border(
+              q-input.q-mt-xs.q-pa-none.rounded-border(
                     :debounce="200"
                     :rules="[rules.required]"
                     bg-color="white"
@@ -558,7 +558,7 @@ export default {
                   )
             .col-3
               label.h-label Discord
-              input-field.q-mt-xs.q-pa-none.rounded-border(
+              q-input.q-mt-xs.q-pa-none.rounded-border(
                     :debounce="200"
                     :rules="[rules.required]"
                     bg-color="white"
@@ -689,7 +689,7 @@ export default {
       //-       //-         v-show="!isCustomPeriodDuration"
       //-       //-       ) Custom period
       //-       //-       div(v-show="isCustomPeriodDuration").bg-primary.text-white.full-width.rounded-border.q-px-sm
-      //-       //-         input-field(borderless v-model="form.periodDurationSec" dense bg-color="primary"
+      //-       //-         q-input(borderless v-model="form.periodDurationSec" dense bg-color="primary"
       //-       //-         placeholder='Type an amount'
       //-       //-         ).input-amount
 
@@ -706,7 +706,7 @@ export default {
       //-             v-model="form.votingAlignmentPercent"
       //-           )
       //-         .col
-      //-           input-field.rounded-border.q-py-sm(
+      //-           q-input.rounded-border.q-py-sm(
       //-             :rules="[val => val >= 0 && val <= 100]"
       //-             dense
       //-             outlined
@@ -728,7 +728,7 @@ export default {
       //-             v-model="form.votingQuorumPercent"
       //-           )
       //-         .col
-      //-           input-field.rounded-border.q-py-sm(
+      //-           q-input.rounded-border.q-py-sm(
       //-             :rules="[val => val >= 0 && val <= 100]"
       //-             dense
       //-             outlined
@@ -775,7 +775,7 @@ export default {
       //-       div.q-mx-sm
       //-         p.q-pa-none.q-ma-none.font-lato.text-heading.text-xs.text-weight-700 Utility token
       //-         p.q-pa-none.q-ma-none.font-sans.text-xs(:style="{'color':'#84878E'}") Multiplier
-      //-       input-field.q-pa-none.q-ma-none.rounded-border.col-5(
+      //-       q-input.q-pa-none.q-ma-none.rounded-border.col-5(
       //-           :debounce="200"
       //-           :rules="[rules.required]"
       //-           bg-color="white"
@@ -795,7 +795,7 @@ export default {
       //-       div.q-mx-sm
       //-         p.q-pa-none.q-ma-none.font-lato.text-heading.text-xs.text-weight-700 Voice token
       //-         p.q-pa-none.q-ma-none.font-sans.text-xs(:style="{'color':'#84878E'}") Multiplier
-      //-       input-field.q-pa-none.q-ma-none.rounded-border.col-5(
+      //-       q-input.q-pa-none.q-ma-none.rounded-border.col-5(
       //-           :debounce="200"
       //-           :rules="[rules.required]"
       //-           bg-color="white"
@@ -815,7 +815,7 @@ export default {
       //-       div.q-mx-sm
       //-         p.q-pa-none.q-ma-none.font-lato.text-heading.text-xs.text-weight-700 Treasury token
       //-         p.q-pa-none.q-ma-none.font-sans.text-xs(:style="{'color':'#84878E'}") Multiplier
-      //-       input-field.q-pa-none.q-ma-none.rounded-border.col-5(
+      //-       q-input.q-pa-none.q-ma-none.rounded-border.col-5(
       //-           :debounce="200"
       //-           :rules="[rules.required]"
       //-           bg-color="white"
@@ -837,7 +837,7 @@ export default {
       //-     .row.q-col-gutter-xs.q-mt-sm
       //-       .col-6
       //-         label.h-label Name
-      //-         input-field.q-mt-xs.q-pa-none.rounded-border(
+      //-         q-input.q-mt-xs.q-pa-none.rounded-border(
       //-               :debounce="200"
       //-               :ref="'salaries.' + index + '.name'"
       //-               :rules="[rules.required]"
@@ -852,7 +852,7 @@ export default {
       //-       .col-6.row.items-center.q-col-gutter-xs
       //-         .col-3
       //-           label.h-label.text-xs.text-weigth-500 Value
-      //-           input-field.q-pa-none.q-mt-xs.rounded-border(
+      //-           q-input.q-pa-none.q-mt-xs.rounded-border(
       //-                 :debounce="200"
       //-                 :ref="'salaries.' + index + '.value'"
       //-                 :rules="[rules.required]"
@@ -868,7 +868,7 @@ export default {
 
       //-         .col-3
       //-           label.h-label.text-xs.text-weigth-500 Utility token
-      //-           input-field.q-pa-none.q-mt-xs.rounded-border(
+      //-           q-input.q-pa-none.q-mt-xs.rounded-border(
       //-                 :debounce="200"
       //-                 :disable="true"
       //-                 :value="salary.value * form.utilityTokenMultiplier"
@@ -881,7 +881,7 @@ export default {
       //-               )
       //-         .col-3
       //-           label.h-label.text-xs.text-weigth-500 Treasury token
-      //-           input-field.q-pa-none.q-mt-xs.rounded-border(
+      //-           q-input.q-pa-none.q-mt-xs.rounded-border(
       //-                 :debounce="200"
       //-                 :disable="true"
       //-                 :value="salary.value * form.treasuryTokenMultiplier"
@@ -894,7 +894,7 @@ export default {
       //-               )
       //-         .col-3
       //-           label.h-label.text-xs.text-weigth-500 Voice token
-      //-           input-field.q-pa-none.q-mt-xs.rounded-border(
+      //-           q-input.q-pa-none.q-mt-xs.rounded-border(
       //-                 :debounce="200"
       //-                 :disable="true"
       //-                 :value="salary.value * form.voiceTokenMultiplier"
@@ -940,7 +940,7 @@ export default {
               .col-auto.q-mr-sm
                 q-avatar(size="40px" :style="{'background': form.primaryColor}")
               .col
-                input-field.rounded-border(
+                q-input.rounded-border(
                       :debounce="200"
                       bg-color="white"
                       dense
@@ -961,7 +961,7 @@ export default {
               .col-auto.q-mr-sm
                 q-avatar(size="40px" :style="{'background': form.secondaryColor}")
               .col
-                input-field.rounded-border(
+                q-input.rounded-border(
                       :debounce="200"
                       bg-color="white"
                       dense
diff --git a/src/pages/profiles/profile-creation.vue b/src/pages/profiles/profile-creation.vue
index 577ed2114..7946f3b8e 100644
--- a/src/pages/profiles/profile-creation.vue
+++ b/src/pages/profiles/profile-creation.vue
@@ -15,7 +15,6 @@ export default {
     ProfilePicture: () => import('~/components/profiles/profile-picture.vue'),
     TextInputToggle: () => import('~/components/form/text-input-toggle.vue'),
     Widget: () => import('~/components/common/widget.vue'),
-    InputField: () => import('~/components/common/input-field.vue'),
     InputEditor: () => import('~/components/common/input-editor.vue')
   },
 
@@ -335,7 +334,7 @@ export default {
         .row.full-width.justify-between.q-mt-xl
           .col-xs-12.col-sm-6.col-md-6.q-pr-sm
             label.h-h4 Name
-            input-field.q-my-md.rounded-border(
+            q-input.q-my-md.rounded-border(
                   :debounce="200"
                   :rules="[rules.required]"
                   bg-color="white"
@@ -350,7 +349,7 @@ export default {
                 )
           .col-xs-12.col-sm-6.col-md-6.q-pl-sm
             label.h-h4 Account name
-            input-field.q-my-md.rounded-border(
+            q-input.q-my-md.rounded-border(
                   bg-color="white"
                   dense
                   lazy-rules
@@ -487,7 +486,7 @@ export default {
                   type="text"
                   placeholder='EOS address'
                 )
-              input-field.col-5.rounded-border.q-pl-sm(
+              q-input.col-5.rounded-border.q-pl-sm(
                   :disable="false"
                   dense
                   outlined
@@ -514,7 +513,7 @@ export default {
                 :iconBackground= "false"
                 :showToggle="false"
                 :text.sync = "form.phoneNumber"
-                :validateRules="[toggles.phoneNumber && rules.required, form.phoneNumber && rules.phoneFormat]"
+                :validateRules="[toggles.phoneNumber && rules.required, form.phoneNumber && rules.isPhoneNumber]"
                 label="Phone"
                 ref="phoneNumber"
               )
@@ -528,7 +527,7 @@ export default {
                 :iconBackground= "false"
                 :showToggle="false"
                 :text.sync = "form.email"
-                :validateRules="[toggles.email && rules.required, form.email && rules.emailFormat]"
+                :validateRules="[toggles.email && rules.required, form.email && rules.isEmail]"
                 label="Email"
                 ref="email"
               )
diff --git a/src/pages/proposals/ProposalDetail.vue b/src/pages/proposals/ProposalDetail.vue
index 347235d6f..5c2dc2882 100644
--- a/src/pages/proposals/ProposalDetail.vue
+++ b/src/pages/proposals/ProposalDetail.vue
@@ -18,7 +18,8 @@ export default {
   },
 
   props: {
-    docId: String
+    docId: String,
+    updateProposals: Promise
   },
 
   data () {
@@ -91,14 +92,14 @@ export default {
           users: comment.reactions[0]?.reactionlnkr?.map(_ => _.author)
         }
       })
-
-      return this.rootCommentIds.map(id => {
+      const comments = this.rootCommentIds.map(id => {
         const comment = this.commentByIds[id]
         return {
           ...mapComment(comment),
           replies: comment && comment.replies && comment.replies.map(comment => mapComment(this.commentByIds[comment.id]))
         }
       })
+      return comments.filter(comment => comment.deletedStatus !== 1)
     },
 
     commentSectionId () { return this?.proposal?.cmntsect[0].docId },
@@ -239,7 +240,6 @@ export default {
               this.pagination.more = false
               return previousResult
             }
-
             const data = {
               getDocument: {
                 ...previousResult.getDocument,
@@ -249,7 +249,7 @@ export default {
                 ]
               }
             }
-            return data
+            this.votesList = data.getDocument.vote
           }
         })
       }
@@ -349,7 +349,9 @@ export default {
       try {
         this.state = 'PUBLISHING'
         await this.publishProposal(proposal.docId)
+        this.$router.replace({ params: { data: proposal, isPublishing: true }, query: { refetch: true } })
       } catch (e) {
+        this.state = 'WAITING'
         const message = e.message || e.cause.message
         this.showNotification({ message, color: 'red' })
       }
@@ -429,6 +431,18 @@ export default {
       this.$router.push({ name: 'proposal-create', params: { draftId } })
     },
 
+    async onDelete (proposal) {
+      try {
+        this.state = 'DELETING'
+        await this.deleteProposal(proposal.docId)
+        this.$router.push({ name: 'proposals', params: { data: proposal, isDeleting: true }, query: { refetch: true } })
+      } catch (e) {
+        this.state = 'WAITING'
+        const message = e.message || e.cause.message
+        this.showNotification({ message, color: 'red' })
+      }
+    },
+
     async loadVoiceTokenPercentage (username, voice) {
       const voiceToken = await this.getVoiceToken(username)
       const supplyHVoice = parseFloat(this.supplyTokens[voiceToken.token])
@@ -472,6 +486,7 @@ export default {
 
         setTimeout(() => {
           this.$apollo.queries.proposal.refetch()
+          this.$emit('updateProposals')
         }, 700)
       } catch (e) {
         const message = e.message || e.cause.message
@@ -489,6 +504,10 @@ export default {
     async deleteComment (commentId) {
       try {
         await this.deleteProposalComment(commentId)
+        setTimeout(() => {
+          this.$apollo.queries.proposal.refetch()
+          this.$emit('updateProposals')
+        }, 700)
       } catch (e) {
         const message = e.message || e.cause.message
         this.showNotification({ message, color: 'red' })
@@ -516,17 +535,6 @@ export default {
         const message = e.message || e.cause.message
         this.showNotification({ message, color: 'red' })
       }
-    },
-    async onDelete (proposal) {
-      try {
-        this.state = 'DELETING'
-        await this.deleteProposal(proposal.docId)
-        this.$router.push({ name: 'proposals', params: { data: proposal, isDeleting: true }, query: { refetch: true } })
-      } catch (e) {
-        this.state = 'WAITING'
-        const message = e.message || e.cause.message
-        this.showNotification({ message, color: 'red' })
-      }
     }
   }
 }
@@ -589,7 +597,6 @@ export default {
         @unlike="unlikeComment"
         @load-comment="fetchComment"
       )
-
     .col-12.col-md-3(:class="{ 'q-pl-md': $q.screen.gt.sm }")
       widget.bg-primary(v-if="proposalParsing.status(proposal) === 'drafted' && isCreator && state === 'WAITING'")
         h2.h-h4.text-white.leading-normal.q-ma-none Your proposal is on staging
@@ -605,9 +612,8 @@ export default {
       widget.bg-primary(v-else-if="proposalParsing.status(proposal) === 'drafted' && isCreator && state === 'DELETING'")
         h2.h-h4.text-white.leading-normal.q-ma-none Deleting
         p.h-b2.q-mt-xl.text-disabled ...Please wait...
-
       div(v-else-if="proposalParsing.status(proposal) !== 'drafted'")
-        voting.q-mb-sm(v-if="$q.screen.gt.sm" :proposal="proposal" @voting="onVoting" @on-apply="onApply(proposal)" @on-suspend="onSuspend(proposal)" @on-active="onActive(proposal)" @change-prop="modifyData" @on-withdraw="onWithDraw(proposal)" :activeButtons="isMember")
+        voting.q-mb-sm(v-if="$q.screen.gt.sm" :proposal="proposal" :isCreator="isCreator" @on-edit="onEdit(proposal)" @voting="onVoting" @on-apply="onApply(proposal)" @on-suspend="onSuspend(proposal)" @on-active="onActive(proposal)" @change-prop="modifyData" @on-withdraw="onWithDraw(proposal)" :activeButtons="isMember")
         voter-list.q-my-md(:votes="votes" @onload="onLoad" :size="voteSize")
 
   .bottom-rounded.shadow-up-7.fixed-bottom(v-if="$q.screen.lt.md")
diff --git a/src/pages/proposals/ProposalList.vue b/src/pages/proposals/ProposalList.vue
index 53997b5a0..10bd3be91 100644
--- a/src/pages/proposals/ProposalList.vue
+++ b/src/pages/proposals/ProposalList.vue
@@ -69,7 +69,7 @@ export default {
       textFilter: null,
       sort: 'Sort by last added',
       circle: 'All circles',
-      optionArray: ['Sort by last added'],
+      optionArray: [{ label: 'Sort by', disable: true }, 'Last added'],
       circleArray: ['All circles', 'Circle One'],
       pagination: {
         first: 50,
@@ -143,7 +143,7 @@ export default {
       }
     },
 
-    orderByVote () {
+    proposals () {
       const daos = this.dao
       if (!(daos && daos.length && Array.isArray(daos[0].proposal))) return []
 
@@ -164,7 +164,7 @@ export default {
     },
 
     filteredProposals () {
-      const proposalOrder = this.orderByVote
+      const proposalOrder = this.proposals
 
       if (proposalOrder.length === 0) return proposalOrder
 
@@ -219,21 +219,37 @@ export default {
   },
   watch: {
     '$route.query.refetch': {
-      handler: function (refetch) {
+      handler: function (_refetch) {
+        const refetch = true
         const proposal = this.$route.params.data
+
         if (refetch && proposal) {
           this.state = 'RUNNING'
           const isDeleting = this.$route.params.isDeleting
+          const isPublishing = this.$route.params.isPublishing
+
           const pullStagedProposals = setInterval(() => {
             if (isDeleting) {
               const deletedProposal = this.stagedProposals.find(_ =>
                 _.docId === proposal.docId
               )
+
               if (!deletedProposal) {
                 this.state = 'DELETED'
                 this.$router.replace({ params: { data: null }, query: {} })
                 clearInterval(pullStagedProposals)
               }
+            } else if (isPublishing) {
+              const isPublished = this.proposals.find(_ =>
+                _.docId === proposal.docId
+              )
+
+              this.$apollo.queries.dao.refetch()
+              if (isPublished) {
+                this.state = 'PUBLISHED'
+                this.$router.replace({ params: { data: null }, query: {} })
+                clearInterval(pullStagedProposals)
+              }
             } else {
               const isCreated = this.stagedProposals.find(_ =>
                 _.details_title_s === proposal.title &&
@@ -414,11 +430,12 @@ export default {
       base-placeholder.q-mr-sm(v-if="!filteredProposals.length && !filteredStagedProposals.length && !$apollo.loading" title= "No Proposals" subtitle="Your organization has not created any proposals yet. You can create a new proposal by clicking the button below."
         icon= "fas fa-file-medical" :actionButtons="[{label: 'Create a new Proposal', color: 'primary', onClick: () => $router.push(`/${this.daoSettings.url}/proposals/create`), disable: !isMember, disableTooltip: 'You must be a member'}]" )
       .q-mb-xl(v-show="showStagedProposals && filteredStagedProposals.length > 0")
-        proposal-list(:username="account" :proposals="filteredStagedProposals" :supply="supply" :view="view" :loading="state !== 'RUNNING'" count="1")
+        proposal-list(:updateProposals="this.$apollo.queries.stagedProposals.refetch()" :username="account" :proposals="filteredStagedProposals" :supply="supply" :view="view" :loading="state !== 'RUNNING'" count="1")
       q-infinite-scroll(@load="onLoad" :offset="500" ref="scroll" :initial-index="1" v-if="filteredProposals.length").scroll
-        proposal-list(:username="account" :proposals="filteredProposals" :supply="supply" :view="view")
+        proposal-list(:updateProposals="this.$apollo.queries.stagedProposals.refetch()" :username="account" :proposals="filteredProposals" :supply="supply" :view="view")
     .col-3
       filter-widget.sticky(:view.sync="view",
+      :defaultOption="1",
       :sort.sync="sort",
       :textFilter.sync="textFilter",
       :circle.sync="circle",
diff --git a/src/pages/proposals/create/OptionsArchetypes.vue b/src/pages/proposals/create/OptionsArchetypes.vue
index c709cb150..527e242ec 100644
--- a/src/pages/proposals/create/OptionsArchetypes.vue
+++ b/src/pages/proposals/create/OptionsArchetypes.vue
@@ -2,8 +2,8 @@
 export default {
   name: 'options-archetypes',
   components: {
-    ArchetypeRadio: () => import('~/components/archetypes/archetype-radio.vue'),
-    InputField: () => import('~/components/common/input-field.vue')
+    ArchetypeRadio: () => import('~/components/archetypes/archetype-radio.vue')
+
   },
 
   props: {
@@ -60,7 +60,7 @@ export default {
 <template lang="pug">
 .options-archetypes.q-mt-md
   .h-h4.q-py-sm.q-mt-sm Choose a role archetype and a complexity band
-  input-field.q-mt-xxs.rounded-border(
+  q-input.q-mt-xxs.rounded-border(
         dense
         label="Filter archetypes"
         outlined
diff --git a/src/pages/proposals/create/OptionsBadges.vue b/src/pages/proposals/create/OptionsBadges.vue
index d78b9a6de..00ad494fd 100644
--- a/src/pages/proposals/create/OptionsBadges.vue
+++ b/src/pages/proposals/create/OptionsBadges.vue
@@ -2,8 +2,8 @@
 export default {
   name: 'options-badges',
   components: {
-    BadgeRadio: () => import('~/components/badges/badge-radio.vue'),
-    InputField: () => import('~/components/common/input-field.vue')
+    BadgeRadio: () => import('~/components/badges/badge-radio.vue')
+
   },
 
   props: {
@@ -73,7 +73,7 @@ export default {
 <template lang="pug">
 .options-badges
   .h-h4.q-py-sm.q-mt-sm Choose a badge type
-  input-field.q-mt-xxs.rounded-border(
+  q-input.q-mt-xxs.rounded-border(
         dense
         label="Filter badges"
         outlined
diff --git a/src/pages/proposals/create/StepCompensation.vue b/src/pages/proposals/create/StepCompensation.vue
index 49a9449f4..492e99ce3 100644
--- a/src/pages/proposals/create/StepCompensation.vue
+++ b/src/pages/proposals/create/StepCompensation.vue
@@ -8,8 +8,8 @@ export default {
     PayoutAmounts: () => import('~/components/common/payout-amounts.vue'),
     Widget: () => import('~/components/common/widget.vue'),
     InfoTooltip: () => import('~/components/common/info-tooltip.vue'),
-    TokenLogo: () => import('~/components/common/token-logo.vue'),
-    InputField: () => import('~/components/common/input-field.vue')
+    TokenLogo: () => import('~/components/common/token-logo.vue')
+
   },
 
   props: {
@@ -340,7 +340,7 @@ widget
       .row.full-width.items-center.q-mt-xs
         q-avatar(size='40px').q-mr-xs
           img(src="~assets/icons/usd.svg")
-        input-field.rounded-border.col(
+        q-input.rounded-border.col(
           :disable="custom"
           dense
           outlined
@@ -364,7 +364,7 @@ widget
             color="primary"
           )
         .col-4
-          input-field.q-ma-none.q-pa-none.rounded-border(
+          q-input.q-ma-none.q-pa-none.rounded-border(
             :disable="custom"
             :rules="[val => val >= 0 && val <= 100]"
             dense
@@ -390,7 +390,7 @@ widget
             v-model="deferred"
           )
         .col-4
-          input-field.q-ma-none.q-pa-none.rounded-border(
+          q-input.q-ma-none.q-pa-none.rounded-border(
             :disable="custom || (!daoSettings.cashClaimsEnabled && isContribution)"
             :rules="[val => val >= 0 && val <= 100]"
             dense
@@ -419,7 +419,7 @@ widget
     .col-6(v-if="fields.roleCapacity")
       label.h-label {{ fields.roleCapacity.label }}
       .text-body2.text-grey-7.q-my-md(v-if="fields.roleCapacity.description") {{ fields.roleCapacity.description }}
-      input-field.q-mt-xs.rounded-border(
+      q-input.q-mt-xs.rounded-border(
         dense
         outlined
         rounded
@@ -439,7 +439,7 @@ widget
           color="primary"
         )
       .col-4.q-pl-sm.q-mt-md
-        input-field.rounded-border(
+        q-input.rounded-border(
           :rules="[val => val >= 0 && val <= 100]"
           outlined
           rounded
@@ -462,7 +462,7 @@ widget
       label.h-label {{ `${fields.reward.label} (${$store.state.dao.settings.rewardToken})` }}
       .row.full-width.items-center.q-mt-xs
         token-logo(size='40px' type='utility' :daoLogo="daoSettings.logo").q-mr-xs
-        input-field.rounded-border.col(
+        q-input.rounded-border.col(
           dense
           :readonly="!custom"
           outlined
@@ -470,7 +470,7 @@ widget
           rounded
           v-if="isAssignment"
         )
-        input-field.rounded-border.col(
+        q-input.rounded-border.col(
           dense
           :readonly="!custom"
           outlined
@@ -483,7 +483,7 @@ widget
       label.h-label {{ `${fields.peg.label} (${$store.state.dao.settings.pegToken})` }}
       .row.full-width.items-center.q-mt-xs
         token-logo(size='40px' type='cash' :daoLogo="daoSettings.logo").q-mr-xs
-        input-field.rounded-border.col(
+        q-input.rounded-border.col(
           dense
           :readonly="!custom"
           outlined
@@ -491,7 +491,7 @@ widget
           rounded
           v-if="isAssignment"
         )
-        input-field.rounded-border.col(
+        q-input.rounded-border.col(
           dense
           :readonly="!custom || !daoSettings.cashClaimsEnabled"
           outlined
@@ -504,7 +504,7 @@ widget
       label.h-label {{ `${fields.voice.label} (${$store.state.dao.settings.voiceToken})` }}
       .row.full-width.items-center.q-mt-xs
         token-logo(size='40px' type='voice' :daoLogo="daoSettings.logo").q-mr-xs
-        input-field.rounded-border.col(
+        q-input.rounded-border.col(
           dense
           :readonly="!custom"
           outlined
@@ -512,7 +512,7 @@ widget
           rounded
           v-if="isAssignment"
         )
-        input-field.rounded-border.col(
+        q-input.rounded-border.col(
           dense
           :readonly="!custom"
           outlined
@@ -542,7 +542,7 @@ widget
           label.h-label {{ `${fields.rewardCoefficient.label} (${$store.state.dao.settings.rewardToken})` }}
           .row.items-center
             .col
-              input-field.q-my-sm.rounded-border(
+              q-input.q-my-sm.rounded-border(
                 v-model="rewardCoefficientLabel" outlined suffix="%"
                 :prefix="fields.rewardCoefficient.disabled ? 'x' : rewardCoefficientLabel > 9 ? 'x1.' : 'x1.0'"
                 :readonly="fields.rewardCoefficient.disabled"
@@ -556,7 +556,7 @@ widget
           label.h-label {{ `${fields.pegCoefficient.label} (${$store.state.dao.settings.pegToken})` }}
           .row.items-center
             .col
-              input-field.q-my-sm.rounded-border(
+              q-input.q-my-sm.rounded-border(
                 v-model="pegCoefficientLabel" outlined suffix="%"
                 :prefix="fields.pegCoefficient.disabled ? 'x' : pegCoefficientLabel > 9 ? 'x1.' : 'x1.0'"
                 :readonly="fields.pegCoefficient.disabled"
@@ -569,7 +569,7 @@ widget
           .text-h6 {{ `${fields.rewardCoefficient.label} (${$store.state.dao.settings.rewardToken})` }}
           .row.items-center
             .col
-              input-field.q-my-sm.rounded-border(
+              q-input.q-my-sm.rounded-border(
                 v-model="rewardCoefficientLabel" outlined suffix="%"
                 :readonly="fields.rewardCoefficient.disabled"
                 :rules="[rules.lessOrEqualThan(20), rules.greaterThanOrEqual(-20)]"
@@ -583,7 +583,7 @@ widget
           label.h-label {{ `${fields.voiceCoefficient.label} (${$store.state.dao.settings.voiceToken})` }}
           .row.items-center
             .col
-              input-field.q-my-sm.rounded-border(
+              q-input.q-my-sm.rounded-border(
                 v-model="voiceCoefficientLabel" outlined suffix="%"
                 :prefix="fields.voiceCoefficient.disabled ? 'x' : voiceCoefficientLabel > 9 ? 'x1.' : 'x1.0'"
                 :readonly="fields.voiceCoefficient.disabled"
diff --git a/src/pages/proposals/create/StepDateDuration.vue b/src/pages/proposals/create/StepDateDuration.vue
index 337463d00..4714f00d6 100644
--- a/src/pages/proposals/create/StepDateDuration.vue
+++ b/src/pages/proposals/create/StepDateDuration.vue
@@ -9,8 +9,8 @@ export default {
   components: {
     PeriodCard: () => import('~/components/assignments/period-card.vue'),
     Widget: () => import('~/components/common/widget.vue'),
-    LoadingSpinner: () => import('~/components/common/loading-spinner.vue'),
-    InputField: () => import('~/components/common/input-field.vue')
+    LoadingSpinner: () => import('~/components/common/loading-spinner.vue')
+
   },
 
   apollo: {
@@ -229,7 +229,7 @@ export default {
 widget
   div(v-if="$store.state.proposals.draft.edit")
     .h-h6 Input the number of periods to extend
-    input-field.q-mt-sm(
+    q-input.q-mt-sm(
      v-model.number="extendedPeriods"
      type="number"
      rounded
diff --git a/src/pages/proposals/create/StepDescription.vue b/src/pages/proposals/create/StepDescription.vue
index a06001cbb..cfa1bf21e 100644
--- a/src/pages/proposals/create/StepDescription.vue
+++ b/src/pages/proposals/create/StepDescription.vue
@@ -4,7 +4,7 @@ import { validation } from '~/mixins/validation'
 import { toHTML, toMarkdown } from '~/utils/turndown'
 
 const TITLE_MAX_LENGTH = 50
-const DESCRIPTION_MAX_LENGTH = 2000
+const DESCRIPTION_MAX_LENGTH = 4000
 
 export default {
   name: 'step-description',
@@ -13,7 +13,6 @@ export default {
     Widget: () => import('~/components/common/widget.vue'),
     InputFileIpfs: () => import('~/components/ipfs/input-file-ipfs.vue'),
     InfoTooltip: () => import('~/components/common/info-tooltip.vue'),
-    InputField: () => import('~/components/common/input-field.vue'),
     InputEditor: () => import('~/components/common/input-editor.vue')
   },
   data () {
@@ -28,7 +27,7 @@ export default {
 
   computed: {
     nextDisabled () {
-      if (this.title.length > 0 && this.title.length <= TITLE_MAX_LENGTH) {
+      if (this.title.length > 0 && this.description.length < DESCRIPTION_MAX_LENGTH && this.title.length <= TITLE_MAX_LENGTH) {
         // if (this.url && isURL(this.url, { require_protocol: true })) {
         //   return false
         // }
@@ -123,7 +122,7 @@ widget
   .row.q-col-gutter-sm.q-mt-sm
     .col(v-if="fields.title")
       label.h-label {{ fields.title.label }}
-      input-field.q-mt-xs.rounded-border(
+      q-input.q-mt-xs.rounded-border(
         :placeholder="fields.title.placeholder"
         :rules="[val => !!val || 'Title is required', val => (val.length <= TITLE_MAX_LENGTH) || `Proposal title length has to be less or equal to ${TITLE_MAX_LENGTH} characters (your title contain ${title.length} characters)`]"
         dense
@@ -134,7 +133,7 @@ widget
       label.h-label {{ fields.badgeRestriction.label }}
       q-icon.q-ml-xxs(size="1rem" name="fas fa-info-circle")
         q-tooltip Maximum amount of periods a badge holder can apply for
-      input-field.q-mt-xs.rounded-border(
+      q-input.q-mt-xs.rounded-border(
         :rules="[rules.positiveAmount]"
         outlined
         dense
@@ -144,6 +143,7 @@ widget
   .col(v-if="fields.description").q-mt-md
     label.h-label {{ fields.description.label }}
         q-field.full-width.q-mt-xs.rounded-border(
+          :rules="[rules.required, val => val.length < DESCRIPTION_MAX_LENGTH || `The description must contain less than ${DESCRIPTION_MAX_LENGTH} characters (your description contain ${description.length} characters)`]"
           dense
           maxlength="2000"
           outlined
@@ -162,7 +162,7 @@ widget
 
   .col(v-if="fields.url").q-mt-md
     label.h-label {{ fields.url.label }}
-    //- input-field.q-mt-xs.rounded-border(
+    //- q-input.q-mt-xs.rounded-border(
     //-   dense
     //-   :placeholder="fields.url.placeholder"
     //-   :rules="[rules.url]"
diff --git a/src/pages/proposals/create/StepIcon.vue b/src/pages/proposals/create/StepIcon.vue
index e6a067e1c..d91bc1801 100644
--- a/src/pages/proposals/create/StepIcon.vue
+++ b/src/pages/proposals/create/StepIcon.vue
@@ -7,8 +7,8 @@ export default {
     InputFileIpfs: () => import('~/components/ipfs/input-file-ipfs.vue'),
     IpfsImageViewer: () => import('~/components/ipfs/ipfs-image-viewer.vue'),
     Widget: () => import('~/components/common/widget.vue'),
-    LoadingSpinner: () => import('~/components/common/loading-spinner.vue'),
-    InputField: () => import('~/components/common/input-field.vue')
+    LoadingSpinner: () => import('~/components/common/loading-spinner.vue')
+
   },
 
   props: {
@@ -162,7 +162,7 @@ widget
     .h-b2.self-center.q-ml-md.no-padding.q-my-sm.q-mx-sm or
 
     .col.full-width.q-my-xxl
-      input-field.q-my-md.q-mx-sm.rounded-border(
+      q-input.q-my-md.q-mx-sm.rounded-border(
         debounce="800"
         dense
         outlined
diff --git a/src/pages/search/Results.vue b/src/pages/search/Results.vue
index abded73b0..f2b0e0c74 100644
--- a/src/pages/search/Results.vue
+++ b/src/pages/search/Results.vue
@@ -49,28 +49,30 @@ export default {
     },
     defaultSelector () {
       switch (this.$route.query.filter) {
+        case 'All':
+          return 1
         case 'Voting':
-          return 0
+          return 2
         case 'Active':
-          return 1
+          return 3
         case 'Archived':
-          return 2
+          return 4
         case 'Suspended':
-          return 3
+          return 5
         default:
-          return 0
+          return 1
       }
     },
     orderDefaultSelector () {
       switch (this.$route.query.order) {
         case 'asc':
-          return 0
-        case 'desc':
           return 1
-        case 'alph':
+        case 'desc':
           return 2
+        case 'alph':
+          return 3
         default:
-          return 0
+          return 1
       }
     }
   },
@@ -204,16 +206,21 @@ export default {
       //   this.params.filter.states = this.params.filter.invalidStates
       // } else {
       // }
-      if (this.filterStatus === 'Active') {
+      if (this.filterStatus === 'All') {
+        this.params.filter.states = this.optionArray.filter(v => (v !== this.filterStatus && v !== 'All' && typeof v !== 'object')).map(s => {
+          return s.toLowerCase()
+        })
+        this.params.filter.states = [...this.params.filter.states, ...this.params.filter.invalidStates]
+      } else if (this.filterStatus === 'Active') {
         // this.params.filter.states = ['approved']
-        this.params.filter.states = this.optionArray.filter(v => v !== this.filterStatus).map(s => {
+        this.params.filter.states = this.optionArray.filter(v => (v !== this.filterStatus && v !== 'All' && typeof v !== 'object')).map(s => {
           if (s === 'Voting') return 'proposed'
           return s.toLowerCase()
         })
         this.params.filter.states = [...this.params.filter.states, ...this.params.filter.invalidStates]
       } else {
         // this.params.filter.states = [this.filterStatus.toLowerCase()]
-        this.params.filter.states = this.optionArray.filter(v => v !== this.filterStatus).map(s => {
+        this.params.filter.states = this.optionArray.filter(v => (v !== this.filterStatus && v !== 'All' && typeof v !== 'object')).map(s => {
           if (s === 'Active') return 'approved'
           if (s === 'Voting') return 'proposed'
           return s.toLowerCase()
@@ -229,15 +236,15 @@ export default {
     },
     async orderSelected (value) {
       const query = this.$route.query
-      if (value === this.circleArray[0]) {
+      if (value === this.circleArray[1]) {
         this.params.filter.sort = 'asc'
         query.order = { asc: 'createdDate' }
       }
-      if (value === this.circleArray[1]) {
+      if (value === this.circleArray[2]) {
         this.params.filter.sort = 'desc'
         query.order = { desc: 'createdDate' }
       }
-      if (value === this.circleArray[2]) {
+      if (value === this.circleArray[3]) {
         this.params.filter.sort = 'A-Z'
         query.order = { alph: 'details_title_s' }
       }
@@ -270,8 +277,8 @@ export default {
           sort: 'asc'
         }
       },
-      optionArray: ['Voting', 'Active', 'Archived', 'Suspended'],
-      circleArray: ['Sort by create date ascending', 'Sort by create date descending', 'Sort alphabetically (A-Z)'],
+      optionArray: [{ label: 'Filter by', disable: true }, 'All', 'Voting', 'Active', 'Archived', 'Suspended'],
+      circleArray: [{ label: 'Sort by', disable: true }, 'Create date ascending', 'Create date descending', 'Alphabetically (A-Z)'],
       results: [],
       filters: [
         {
diff --git a/src/query/dao-active.gql b/src/query/dao-active.gql
index b7947baa5..6fc7fcf1f 100644
--- a/src/query/dao-active.gql
+++ b/src/query/dao-active.gql
@@ -66,6 +66,10 @@ query activeDao($regexp: String!) {
       settings_organisationBackgroundImage_s
       settings_organisationTitle_s
       settings_organisationParagraph_s
+
+      settings_exploreBackgroundImage_s
+      settings_exploreTitle_s
+      settings_exploreParagraph_s
     }
   }
 }
diff --git a/src/query/proposals/dao-proposal-comment.gql b/src/query/proposals/dao-proposal-comment.gql
index be0842281..c3f35df81 100644
--- a/src/query/proposals/dao-proposal-comment.gql
+++ b/src/query/proposals/dao-proposal-comment.gql
@@ -5,6 +5,7 @@ query comment($docId: String!) {
     author: comment_author_n
     content: comment_content_s
     createdDate
+    deletedStatus: comment_deleted_i
 
     reactions: reaction {
       reactionlnkrAggregate {
@@ -25,6 +26,7 @@ query comment($docId: String!) {
       author: comment_author_n
       content: comment_content_s
       createdDate
+      deletedStatus: comment_deleted_i
 
       reactions: reaction {
         reactionlnkrAggregate {
diff --git a/src/query/proposals/dao-proposal-detail.gql b/src/query/proposals/dao-proposal-detail.gql
index 5d649feae..5f7a7971f 100644
--- a/src/query/proposals/dao-proposal-detail.gql
+++ b/src/query/proposals/dao-proposal-detail.gql
@@ -34,6 +34,7 @@ query proposal($docId: String!, $first: Int!, $offset: Int!) {
           author: comment_author_n
           content: comment_content_s
           createdDate
+          deletedStatus: comment_deleted_i
 
           reactions: reaction {
             reactionlnkrAggregate {
@@ -117,6 +118,7 @@ query proposal($docId: String!, $first: Int!, $offset: Int!) {
           author: comment_author_n
           content: comment_content_s
           createdDate
+          deletedStatus: comment_deleted_i
 
           reactions: reaction {
             reactionlnkrAggregate {
@@ -185,6 +187,7 @@ query proposal($docId: String!, $first: Int!, $offset: Int!) {
           author: comment_author_n
           content: comment_content_s
           createdDate
+          deletedStatus: comment_deleted_i
 
           reactions: reaction {
             reactionlnkrAggregate {
@@ -247,6 +250,7 @@ query proposal($docId: String!, $first: Int!, $offset: Int!) {
           author: comment_author_n
           content: comment_content_s
           createdDate
+          deletedStatus: comment_deleted_i
 
           reactions: reaction {
             reactionlnkrAggregate {
@@ -308,6 +312,7 @@ query proposal($docId: String!, $first: Int!, $offset: Int!) {
           author: comment_author_n
           content: comment_content_s
           createdDate
+          deletedStatus: comment_deleted_i
 
           reactions: reaction {
             reactionlnkrAggregate {
diff --git a/src/query/proposals/dao-proposals-active-vote.gql b/src/query/proposals/dao-proposals-active-vote.gql
index d57923a8e..e9e2f596b 100644
--- a/src/query/proposals/dao-proposals-active-vote.gql
+++ b/src/query/proposals/dao-proposals-active-vote.gql
@@ -26,7 +26,8 @@ query proposals ($docId: String!, $user: String, $first: Int!, $offset: Int!) {
         cmntsect {
           docId
           comment {
-            id: docId
+            id: docId,
+            deletedStatus: comment_deleted_i
           }
         }
       }
@@ -68,7 +69,8 @@ query proposals ($docId: String!, $user: String, $first: Int!, $offset: Int!) {
         cmntsect {
           docId
           comment {
-            id: docId
+            id: docId,
+            deletedStatus: comment_deleted_i
           }
         }
       }
@@ -92,7 +94,8 @@ query proposals ($docId: String!, $user: String, $first: Int!, $offset: Int!) {
         cmntsect {
           docId
           comment {
-            id: docId
+            id: docId,
+            deletedStatus: comment_deleted_i
           }
         }
       }
@@ -111,7 +114,8 @@ query proposals ($docId: String!, $user: String, $first: Int!, $offset: Int!) {
         cmntsect {
           docId
           comment {
-            id: docId
+            id: docId,
+            deletedStatus: comment_deleted_i
           }
         }
       }
@@ -130,7 +134,8 @@ query proposals ($docId: String!, $user: String, $first: Int!, $offset: Int!) {
         cmntsect {
           docId
           comment {
-            id: docId
+            id: docId,
+            deletedStatus: comment_deleted_i
           }
         }
       }
diff --git a/src/query/proposals/dao-proposals-stage.gql b/src/query/proposals/dao-proposals-stage.gql
index 69b2e7325..c65f3cd02 100644
--- a/src/query/proposals/dao-proposals-stage.gql
+++ b/src/query/proposals/dao-proposals-stage.gql
@@ -27,7 +27,8 @@ query stageProposals($docId: String!, $first: Int!, $offset: Int!) {
         cmntsect {
           docId
           comment {
-            id: docId
+            id: docId,
+            deletedStatus: comment_deleted_i
           }
         }
       }
@@ -78,7 +79,8 @@ query stageProposals($docId: String!, $first: Int!, $offset: Int!) {
         cmntsect {
           docId
           comment {
-            id: docId
+            id: docId,
+            deletedStatus: comment_deleted_i
           }
         }
       }
@@ -103,7 +105,8 @@ query stageProposals($docId: String!, $first: Int!, $offset: Int!) {
         cmntsect {
           docId
           comment {
-            id: docId
+            id: docId,
+            deletedStatus: comment_deleted_i
           }
         }
       }
@@ -124,7 +127,8 @@ query stageProposals($docId: String!, $first: Int!, $offset: Int!) {
         cmntsect {
           docId
           comment {
-            id: docId
+            id: docId,
+            deletedStatus: comment_deleted_i
           }
         }
       }
@@ -159,10 +163,69 @@ query stageProposals($docId: String!, $first: Int!, $offset: Int!) {
           }
         }
         system_proposer_n
+        cmntsect {
+          docId
+          comment {
+            id: docId,
+            deletedStatus: comment_deleted_i
+          }
+        }
+      }
+
+      ... on Edit {
+        details_dao_i
+        details_state_s
+
+        creator
+        details_ballotTitle_s
+        details_ballotDescription_s
+        ballot_expiration_t
+        details_assignee_n
+        details_periodCount_i
+        details_ballotQuorum_i
+        details_ballotSupply_a
+        details_ballotAlignment_i
+        details_timeShareX100_i
+        details_deferredPercX100_i
+        details_state_s
+        original {
+          ... on Assignbadge {
+            details_title_s
+            details_description_s
+            start {
+              details_startTime_t
+            }
+            badge {
+              details_title_s
+            }
+          }
+          ... on Assignment {
+            details_title_s
+            details_description_s
+            claimed {
+              docId
+            }
+            start {
+              details_startTime_t
+            }
+            details_pegSalaryPerPeriod_a
+            details_rewardSalaryPerPeriod_a
+            details_voiceSalaryPerPeriod_a
+            role {
+              ... on Role {
+                details_title_s
+                details_annualUsdSalary_a
+                details_minDeferredX100_i
+              }
+            }
+          }
+        }
+
         cmntsect {
           docId
           comment {
             id: docId
+            deletedStatus: comment_deleted_i
           }
         }
       }
diff --git a/src/store/accounts/actions.js b/src/store/accounts/actions.js
index d494aafda..79813219a 100644
--- a/src/store/accounts/actions.js
+++ b/src/store/accounts/actions.js
@@ -118,7 +118,7 @@ export const autoLogin = async function ({ dispatch }) {
   return false
 }
 
-export const isAccountFree = async function (context, accountName) {
+export const isAccountAvailable = async function (context, accountName) {
   try {
     await this.$api.getAccount(accountName)
     return false
diff --git a/src/store/dao/actions.js b/src/store/dao/actions.js
index aef877ac6..e3da3b42d 100644
--- a/src/store/dao/actions.js
+++ b/src/store/dao/actions.js
@@ -194,7 +194,7 @@ export const updateDAOSettings = async function (context, { docId, data, alerts,
   return this.$api.signTransaction(actions)
 }
 
-export const isTokenFree = async function (context, token) {
+export const isTokenAvailable = async function (context, token) {
   const { rows } = await this.$api.getTableRows({
     code: this.$config.contracts.husdToken,
     scope: token,
diff --git a/src/store/dao/mutations.js b/src/store/dao/mutations.js
index 44233a051..4eb7ceb50 100644
--- a/src/store/dao/mutations.js
+++ b/src/store/dao/mutations.js
@@ -74,8 +74,11 @@ export const switchDao = (state, daos) => {
 
       organisationBackgroundImage: settings?.settings_organisationBackgroundImage_s,
       organisationTitle: settings?.settings_organisationTitle_s,
-      organisationParagraph: settings?.settings_organisationParagraph_s
+      organisationParagraph: settings?.settings_organisationParagraph_s,
 
+      exploreBackgroundImage: settings?.settings_exploreBackgroundImage_s,
+      exploreTitle: settings?.settings_exploreTitle_s,
+      exploreParagraph: settings?.settings_exploreParagraph_s
     }
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 9be4f680e..a5828fc45 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1518,7 +1518,7 @@
   dependencies:
     "@jridgewell/trace-mapping" "0.3.9"
 
-"@cypress/request@^2.88.5":
+"@cypress/request@^2.88.10":
   version "2.88.10"
   resolved "https://registry.yarnpkg.com/@cypress/request/-/request-2.88.10.tgz#b66d76b07f860d3a4b8d7a0604d020c662752cce"
   integrity sha512-Zp7F+R93N0yZyG34GutyTNr+okam7s/Fzc1+i3kcqOP8vk6OuajuE9qZJ6Rs+10/1JFtXFYMdyarnU1rZuJesg==
@@ -3340,10 +3340,10 @@
     "@types/mime" "^1"
     "@types/node" "*"
 
-"@types/sinonjs__fake-timers@^6.0.2":
-  version "6.0.4"
-  resolved "https://registry.yarnpkg.com/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-6.0.4.tgz#0ecc1b9259b76598ef01942f547904ce61a6a77d"
-  integrity sha512-IFQTJARgMUBF+xVd2b+hIgXWrZEjND3vJtRCvIelcFB5SIXfjV4bOHbHJ0eXKh+0COrBRc8MqteKAz/j88rE0A==
+"@types/sinonjs__fake-timers@8.1.1":
+  version "8.1.1"
+  resolved "https://registry.yarnpkg.com/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-8.1.1.tgz#b49c2c70150141a15e0fa7e79cf1f92a72934ce3"
+  integrity sha512-0kSuKjAS0TrGLJ0M/+8MaFkGsQhZpB6pxOmvS3K8FYI72K//YmdfoW9X2qPsAKh1mkwxGD5zib9s1FIFed6E8g==
 
 "@types/sizzle@^2.3.2":
   version "2.3.3"
@@ -5114,7 +5114,7 @@ buffer@^4.3.0:
     ieee754 "^1.1.4"
     isarray "^1.0.0"
 
-buffer@^5.5.0:
+buffer@^5.5.0, buffer@^5.6.0:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
   integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
@@ -5612,7 +5612,7 @@ cli-spinners@^2.5.0:
   resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.7.0.tgz#f815fd30b5f9eaac02db604c7a231ed7cb2f797a"
   integrity sha512-qu3pN8Y3qHNgE2AFweciB1IfMnmZ/fsNTEE+NOFjmGB2F/7rLhnhzppvpCnN4FovtP26k8lHyy9ptEbNwWFLzw==
 
-cli-table3@^0.6.1, cli-table3@~0.6.0:
+cli-table3@^0.6.1, cli-table3@~0.6.1:
   version "0.6.2"
   resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.6.2.tgz#aaf5df9d8b5bf12634dc8b3040806a0c07120d2a"
   integrity sha512-QyavHCaIC80cMivimWu4aWHilIpiDpfm3hGmqAmXVL1UsnbLuBSMd21hTX6VY4ZSDSM73ESLeF8TOYId3rBTbw==
@@ -6494,24 +6494,25 @@ cyclist@^1.0.1:
   resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9"
   integrity sha512-NJGVKPS81XejHcLhaLJS7plab0fK3slPh11mESeeDq2W4ZI5kUKK/LRRdVDvjJseojbPB7ZwjnyOybg3Igea/A==
 
-cypress@^7.3.0:
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/cypress/-/cypress-7.7.0.tgz#0839ae28e5520536f9667d6c9ae81496b3836e64"
-  integrity sha512-uYBYXNoI5ym0UxROwhQXWTi8JbUEjpC6l/bzoGZNxoKGsLrC1SDPgIDJMgLX/MeEdPL0UInXLDUWN/rSyZUCjQ==
+cypress@^10.7.0:
+  version "10.7.0"
+  resolved "https://registry.yarnpkg.com/cypress/-/cypress-10.7.0.tgz#2d37f8b9751c6de33ee48639cb7e67a2ce593231"
+  integrity sha512-gTFvjrUoBnqPPOu9Vl5SBHuFlzx/Wxg/ZXIz2H4lzoOLFelKeF7mbwYUOzgzgF0oieU2WhJAestQdkgwJMMTvQ==
   dependencies:
-    "@cypress/request" "^2.88.5"
+    "@cypress/request" "^2.88.10"
     "@cypress/xvfb" "^1.2.4"
     "@types/node" "^14.14.31"
-    "@types/sinonjs__fake-timers" "^6.0.2"
+    "@types/sinonjs__fake-timers" "8.1.1"
     "@types/sizzle" "^2.3.2"
     arch "^2.2.0"
     blob-util "^2.0.2"
     bluebird "^3.7.2"
+    buffer "^5.6.0"
     cachedir "^2.3.0"
     chalk "^4.1.0"
     check-more-types "^2.24.0"
     cli-cursor "^3.1.0"
-    cli-table3 "~0.6.0"
+    cli-table3 "~0.6.1"
     commander "^5.1.0"
     common-tags "^1.8.0"
     dayjs "^1.10.4"
@@ -6530,15 +6531,15 @@ cypress@^7.3.0:
     listr2 "^3.8.3"
     lodash "^4.17.21"
     log-symbols "^4.0.0"
-    minimist "^1.2.5"
+    minimist "^1.2.6"
     ospath "^1.2.2"
     pretty-bytes "^5.6.0"
-    ramda "~0.27.1"
+    proxy-from-env "1.0.0"
     request-progress "^3.0.0"
+    semver "^7.3.2"
     supports-color "^8.1.1"
     tmp "~0.2.1"
     untildify "^4.0.0"
-    url "^0.11.0"
     yauzl "^2.10.0"
 
 cz-conventional-changelog@3.3.0, cz-conventional-changelog@^3.3.0:
@@ -13352,6 +13353,11 @@ proxy-addr@~2.0.7:
     forwarded "0.2.0"
     ipaddr.js "1.9.1"
 
+proxy-from-env@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.0.0.tgz#33c50398f70ea7eb96d21f7b817630a55791c7ee"
+  integrity sha512-F2JHgJQ1iqwnHDcQjVBsq3n/uoaFL+iPW/eAeL7kVxy/2RrWaN4WroKjjvbsoRtv0ftelNyC01bjRhn/bhcf4A==
+
 prr@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
@@ -13616,11 +13622,6 @@ ramda@^0.28.0:
   resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.28.0.tgz#acd785690100337e8b063cab3470019be427cc97"
   integrity sha512-9QnLuG/kPVgWvMQ4aODhsBUFKOUmnbUnsSXACv+NCQZcHbeb+v8Lodp8OVxtRULN1/xOyYLLaL6npE6dMq5QTA==
 
-ramda@~0.27.1:
-  version "0.27.2"
-  resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.27.2.tgz#84463226f7f36dc33592f6f4ed6374c48306c3f1"
-  integrity sha512-SbiLPU40JuJniHexQSAgad32hfwd+DRUdwF2PlVuI5RZD0/vahUco7R8vD86J/tcEKKF9vZrUVwgtmGCqlCKyA==
-
 randombytes@2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.5.tgz#dc009a246b8d09a177b4b7a0ae77bc570f4b1b79"