diff --git a/CHANGELOG.md b/CHANGELOG.md
index ffe893b39a..4e8cb5a7e7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 * [\#1464](https://github.com/cosmos/voyager/issues/1464) Added governance transactions to tx history page @fedekunze
 * [\#1401](https://github.com/cosmos/voyager/issues/1401) Display governance proposals index. @fedekunze
 * [\#1472](https://github.com/cosmos/voyager/issues/1472) Added mock functionality for redelegation @fedekunze + @faboweb
+* [\#1402](https://github.com/cosmos/voyager/issues/1402) Proposal creation through modal @fedekunze + @NodeGuy + @jbibla
 * [\#1501](https://github.com/cosmos/voyager/issues/1501) Vote on proposals through modal @fedekunze + @jbibla
 * [\#1567](https://github.com/cosmos/voyager/pull/1567) Various refactors on `main`, `node` and `lcdClient`. @NodeGuy
 * [\#1502](https://github.com/cosmos/voyager/issues/1502) A page for each proposal. @jbibla
@@ -46,6 +47,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 * [\#1410](https://github.com/cosmos/voyager/issues/1410) removed end undelegations as not needed in the SDK anymore
 * [\#1543](https://github.com/cosmos/voyager/issues/1543) updated unit tests to use `describe` and `it` instead of `test` @fedekunze
 * [\#1377](https://github.com/cosmos/voyager/issues/1377) deleted AppFooter page @fedekunze
+* [\#1582](https://github.com/cosmos/voyager/issues/1582) proposals now use time instead of block number @fedekunze
 
 ### Fixed
 
@@ -64,6 +66,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 * [\#1131](https://github.com/cosmos/voyager/issues/1131) Display only error message on notifications @fedekunze
 * [\#1440](https://github.com/cosmos/voyager/issues/1440) Fixed an error that prevented disconnecting from the RPC websocket if it wasn't defined @fedekunze
 * [\#1460](https://github.com/cosmos/voyager/issues/1460) Removing release-candidate tag when publishing @faboweb
+* [\#1402](https://github.com/cosmos/voyager/issues/1402) Fixed minor issues in voting and deposit @fedekunze
 * [\#1574](https://github.com/cosmos/voyager/issues/1574) Fixed typo on mocked governance txs that prevented the execution of the query @fedekunze
 * [\#1575](https://github.com/cosmos/voyager/issues/1575) Fixed tags on governace transactions query @fedekunze
 
diff --git a/app/src/renderer/components/common/PagePreferences.vue b/app/src/renderer/components/common/PagePreferences.vue
index 9c5a54c67a..a4091a87d4 100644
--- a/app/src/renderer/components/common/PagePreferences.vue
+++ b/app/src/renderer/components/common/PagePreferences.vue
@@ -1,6 +1,8 @@
 <template lang="pug">
 tm-page(data-title="Preferences")
-  div(slot="menu"): vm-tool-bar
+  template(slot="menu-body")
+    tm-balance
+    vm-tool-bar
 
   tm-part(title='Settings')
     tm-list-item(type="field" title="Select network to connect to")
@@ -48,11 +50,13 @@ tm-page(data-title="Preferences")
 import { mapGetters } from "vuex"
 import { TmListItem, TmBtn, TmPage, TmPart, TmField } from "@tendermint/ui"
 import VmToolBar from "common/VmToolBar"
+import TmBalance from "common/TmBalance"
 import TmModal from "common/TmModal"
 
 export default {
   name: `page-preferences`,
   components: {
+    TmBalance,
     TmBtn,
     TmField,
     TmListItem,
diff --git a/app/src/renderer/components/common/TmBalance.vue b/app/src/renderer/components/common/TmBalance.vue
index 4e11640f07..fba073cbd9 100644
--- a/app/src/renderer/components/common/TmBalance.vue
+++ b/app/src/renderer/components/common/TmBalance.vue
@@ -26,6 +26,8 @@
         :class="{'tab-selected': $route.name === tab}",
       )
         router-link(:to="{name: tab}") {{ tab }}
+
+    slot
 </template>
 <script>
 import num from "scripts/num"
@@ -133,4 +135,9 @@ export default {
 
       a
         color var(--bright)
+
+.tm-btn
+  position absolute
+  right 0rem
+  bottom 1rem
 </style>
diff --git a/app/src/renderer/components/common/VmToolBar.vue b/app/src/renderer/components/common/VmToolBar.vue
index 7d8a952805..1770e0b49e 100644
--- a/app/src/renderer/components/common/VmToolBar.vue
+++ b/app/src/renderer/components/common/VmToolBar.vue
@@ -1,25 +1,21 @@
 <template lang="pug">
-  tm-tool-bar
+  .tm-tool-bar
     a.back(@click="back" :disabled="user.history.length === 0" v-tooltip.bottom="'Back'")
       i.material-icons arrow_back
     slot
     a.help(@click="enableModalHelp" v-tooltip.bottom="'Help'")
       i.material-icons help_outline
-    router-link.settings(to="/preferences" v-tooltip.bottom="'Preferences'")
-      i.material-icons#settings settings
+    router-link#settings(to="/preferences" v-tooltip.bottom="'Preferences'")
+      i.material-icons settings
     a#signOut-btn(@click="signOut" v-tooltip.bottom.end="'Sign Out'")
       i.material-icons exit_to_app
 </template>
 
 <script>
-import { TmToolBar } from "@tendermint/ui"
 import { mapGetters, mapMutations } from "vuex"
 export default {
   // the name needs to be different from TmToolBar (tm-tool-bar) or else recursive rendering takes place
   name: `vm-tool-bar`,
-  components: {
-    TmToolBar
-  },
   methods: {
     ...mapMutations([`pauseHistory`, `popHistory`]),
     back() {
@@ -43,6 +39,21 @@ export default {
 }
 </script>
 <style lang="stylus">
-.tm-tool-bar-container a
-  margin-top 0 !important
+
+.tm-tool-bar
+  height 100%
+
+.tm-page-header-text
+  padding-right 1rem
+
+  a
+    cursor pointer
+
+  i
+    padding 1rem
+    color var(--dim)
+
+    &:hover
+      color var(--bright)
+
 </style>
diff --git a/app/src/renderer/components/governance/LiProposal.vue b/app/src/renderer/components/governance/LiProposal.vue
index 9950dc6d86..f8efe69198 100644
--- a/app/src/renderer/components/governance/LiProposal.vue
+++ b/app/src/renderer/components/governance/LiProposal.vue
@@ -3,9 +3,9 @@ tr.li-proposal
   td.li-proposal__value
     span.validator-profile__status(v-bind:class="status.color" v-tooltip.top="status.message")
     h2
-      router-link(:to="{ name: 'Proposal', params: { proposalId, proposal, status }}") {{ proposal.title }}
+      router-link(:to="{ name: 'Proposal', params: { proposalId: proposal.proposal_id, proposal, status }}") {{ proposal.title }}
     p {{ description }}
-  td {{ submitBlock }}
+  td {{ `#` + proposal.proposal_id }}
   td.li-proposal__value.yes {{ proposal.tally_result.yes }}
   td.li-proposal__value.no {{ proposal.tally_result.no }}
   td.li-proposal__value.no_with_veto {{ proposal.tally_result.no_with_veto }}
@@ -13,7 +13,6 @@ tr.li-proposal
 </template>
 
 <script>
-import num from "scripts/num"
 export default {
   name: `li-proposal`,
   computed: {
@@ -53,12 +52,6 @@ export default {
       return this.proposal.description.length > 100
         ? this.proposal.description.substring(0, 100) + `…`
         : this.proposal.description.substring(0, 100)
-    },
-    submitBlock() {
-      return `#` + num.prettyInt(this.proposal.submit_block)
-    },
-    proposalId() {
-      return this.proposal.proposal_id
     }
   },
   props: [`proposal`]
diff --git a/app/src/renderer/components/governance/ModalDeposit.vue b/app/src/renderer/components/governance/ModalDeposit.vue
index 9f6b89ef47..a348d93e32 100644
--- a/app/src/renderer/components/governance/ModalDeposit.vue
+++ b/app/src/renderer/components/governance/ModalDeposit.vue
@@ -85,7 +85,13 @@ export default {
       this.$emit(`update:showModalDeposit`, false)
     },
     onDeposit() {
-      this.$emit(`submitDeposit`, { amount: this.amount })
+      let amount = [
+        {
+          denom: this.denom,
+          amount: String(this.amount)
+        }
+      ]
+      this.$emit(`submitDeposit`, { amount })
       this.close()
     }
   },
diff --git a/app/src/renderer/components/governance/ModalPropose.vue b/app/src/renderer/components/governance/ModalPropose.vue
new file mode 100644
index 0000000000..22ffac986f
--- /dev/null
+++ b/app/src/renderer/components/governance/ModalPropose.vue
@@ -0,0 +1,207 @@
+<template lang="pug">
+  .modal-propose#modal-propose(v-click-outside="close")
+    .modal-propose-header
+      img.icon(class='modal-propose-atom' src="~assets/images/cosmos-logo.png")
+      span.tm-modal-title Create Proposal
+      .tm-modal-icon.tm-modal-close#closeBtn(@click="close()")
+        i.material-icons close
+
+    tm-form-group.page-proposal-form-group
+      span Title
+      tm-field#title(
+        type="text"
+        placeholder="Proposal title"
+        v-model="title"
+        v-focus)
+
+    tm-form-group.page-proposal-form-group
+      span Description
+      tm-field#description(
+        type="textarea"
+        placeholder="Write your proposal here..."
+        v-model="description")
+
+    tm-form-group.modal-propose-form-group(
+      field-id='amount')
+      span Deposit amount
+      tm-field#denom(
+        type="text"
+        :placeholder="denom"
+        readonly)
+
+      tm-field#amount(
+        type="number"
+        :max="balance"
+        :min="0"
+        step="any"
+        v-model="amount"
+        v-focus)
+
+    .modal-propose-footer
+      tm-btn#submit-proposal(
+        @click.native="onPropose"
+        :disabled="$v.$invalid"
+        color="primary"
+        value="Submit proposal"
+        size="lg")
+</template>
+
+<script>
+import { mapGetters } from "vuex"
+import ClickOutside from "vue-click-outside"
+import {
+  minLength,
+  maxLength,
+  required,
+  between
+} from "vuelidate/lib/validators"
+import { isEmpty, trim } from "lodash"
+import Modal from "common/TmModal"
+import { TmBtn, TmField, TmFormGroup } from "@tendermint/ui"
+
+const isValid = type =>
+  type === `Text` || type === `ParameterChange` || type === `SoftwareUpgrade`
+
+const notBlank = text => !isEmpty(trim(text))
+
+export default {
+  name: `modal-propose`,
+  props: [`denom`],
+  computed: {
+    // TODO: get coin denom from governance params
+    ...mapGetters([`wallet`]),
+    balance() {
+      // TODO: refactor to get the selected coin when multicoin deposit is enabled
+      if (!this.wallet.balancesLoading && !!this.wallet.balances.length) {
+        let balance = this.wallet.balances.find(
+          coin => coin.denom === this.denom
+        )
+        if (balance) return parseFloat(balance.amount)
+      }
+      return 0
+    }
+  },
+  components: {
+    Modal,
+    TmBtn,
+    TmField,
+    TmFormGroup
+  },
+  data: () => ({
+    titleMinLength: 1,
+    titleMaxLength: 64,
+    descriptionMinLength: 1,
+    descriptionMaxLength: 200,
+    title: ``,
+    description: ``,
+    type: `Text`,
+    amount: 0
+  }),
+  validations() {
+    return {
+      title: {
+        required,
+        minLength(x) {
+          return minLength(this.titleMinLength)(x)
+        },
+        maxLength(x) {
+          return maxLength(this.titleMaxLength)(x)
+        },
+        notBlank
+      },
+      description: {
+        required,
+        minLength(x) {
+          return minLength(this.descriptionMinLength)(x)
+        },
+        maxLength(x) {
+          return maxLength(this.descriptionMaxLength)(x)
+        },
+        notBlank
+      },
+      type: {
+        isValid
+      },
+      amount: {
+        required,
+        between: between(
+          0.0000000001,
+          this.balance > 0 ? this.balance : 0.0000000001
+        )
+      }
+    }
+  },
+  methods: {
+    close() {
+      this.$emit(`update:showModalPropose`, false)
+    },
+    onPropose() {
+      this.$emit(`createProposal`, {
+        title: this.title,
+        description: this.description,
+        type: this.type,
+        amount: this.amount
+      })
+      this.close()
+    }
+  },
+  directives: {
+    ClickOutside
+  }
+}
+</script>
+
+<style lang="stylus">
+@import '~variables'
+
+.modal-propose
+  background var(--app-nav)
+  display flex
+  flex-direction column
+  justify-content space-between
+  left 50%
+  padding 2rem
+  position fixed
+  bottom 0
+  width 50%
+  z-index z(modal)
+
+  &-header
+    align-items center
+    display flex
+
+  &-atom
+    height 4rem
+    width 4rem
+
+  &-form-group
+    display block
+    padding 0
+
+  #amount
+    margin-top -32px
+
+  #denom
+    border none
+    margin-left 80%
+    text-align right
+    width 72px
+
+  &-footer
+    display flex
+    justify-content flex-end
+
+    button
+      margin-left 1rem
+      margin-top 1rem
+
+  .page-proposal-form-group
+    display block
+    padding 0
+
+    textarea
+      min-height 300px
+
+  .tm-form-group
+    margin 0.5rem 0
+</style>
diff --git a/app/src/renderer/components/governance/ModalVote.vue b/app/src/renderer/components/governance/ModalVote.vue
index 13174ac3d9..77cbc96b2b 100644
--- a/app/src/renderer/components/governance/ModalVote.vue
+++ b/app/src/renderer/components/governance/ModalVote.vue
@@ -12,29 +12,29 @@
 
     tm-form-group.modal-vote-form-group.options
       tm-btn#vote-yes(
-        @click.native="vote('yes')"
-        :class="[option ===  `yes` ? 'active' : '']"
+        @click.native="vote('Yes')"
+        :class="[option ===  `Yes` ? 'active' : '']"
         color="secondary"
         value="Yes"
         size="md")
 
       tm-btn#vote-no(
-        @click.native="vote('no')"
-        :class="[option === `no` ? 'active' : '']"
+        @click.native="vote('No')"
+        :class="[option === `No` ? 'active' : '']"
         color="secondary"
         value="No"
         size="md")
 
       tm-btn#vote-veto(
-        @click.native="vote('no_with_veto')"
-        :class="[option === `no_with_veto` ? 'active' : '']"
+        @click.native="vote('NoWithVeto')"
+        :class="[option === `NoWithVeto` ? 'active' : '']"
         color="secondary"
         value="No With Veto"
         size="md")
 
       tm-btn#vote-abstain(
-        @click.native="vote('abstain')"
-        :class="[option === `abstain` ? 'active' : '']"
+        @click.native="vote('Abstain')"
+        :class="[option === `Abstain` ? 'active' : '']"
         color="secondary"
         value="Abstain"
         size="md")
@@ -56,10 +56,10 @@ import Modal from "common/TmModal"
 import { TmBtn, TmField, TmFormGroup, TmFormMsg } from "@tendermint/ui"
 
 const isValid = option =>
-  option === `yes` ||
-  option === `no` ||
-  option === `no_with_veto` ||
-  option === `abstain`
+  option === `Yes` ||
+  option === `No` ||
+  option === `NoWithVeto` ||
+  option === `Abstain`
 
 export default {
   name: `modal-vote`,
diff --git a/app/src/renderer/components/governance/PageGovernance.vue b/app/src/renderer/components/governance/PageGovernance.vue
index 907919166d..b013d14be9 100644
--- a/app/src/renderer/components/governance/PageGovernance.vue
+++ b/app/src/renderer/components/governance/PageGovernance.vue
@@ -1,16 +1,19 @@
 <template lang="pug">
 tm-page(data-title='Governance').governance
   template(slot="menu-body")
-    tm-balance(:tabs="tabs")
+    tm-balance(:tabs="tabs"): tm-btn#propose-btn(value="Create Proposal" color="primary" @click.native="onPropose")
 
-  div(slot="menu"): vm-tool-bar
-    router-link(to="/governance/proposals/new" exact v-tooltip.bottom="'New Proposal'")
-      i.material-icons add
-    a(@click='setSearch()' v-tooltip.bottom="'Search'")
-      i.search.material-icons search
+    vm-tool-bar
+      a(@click='setSearch()' v-tooltip.bottom="'Search'")
+        i.search.material-icons search
 
   modal-search(type="proposals")
-
+  modal-propose(
+    v-if="showModalPropose"
+    v-on:createProposal="propose"
+    :showModalPropose.sync="showModalPropose"
+    :denom="bondingDenom.toLowerCase()"
+  )
   router-view
 </template>
 
@@ -18,9 +21,10 @@ tm-page(data-title='Governance').governance
 import { mapGetters } from "vuex"
 import DataEmptySearch from "common/TmDataEmptySearch"
 import ModalSearch from "common/TmModalSearch"
+import ModalPropose from "./ModalPropose"
 import VmToolBar from "common/VmToolBar"
 import TmBalance from "common/TmBalance"
-import { TmPage, TmDataEmpty, TmDataLoading } from "@tendermint/ui"
+import { TmPage, TmDataEmpty, TmDataLoading, TmBtn } from "@tendermint/ui"
 export default {
   name: `page-governance`,
   components: {
@@ -29,16 +33,48 @@ export default {
     TmDataEmpty,
     DataEmptySearch,
     ModalSearch,
+    ModalPropose,
     TmPage,
+    TmBtn,
     VmToolBar
   },
   computed: {
-    ...mapGetters([`config`, `proposals`, `filters`])
+    // TODO: get min deposit denom from gov params
+    ...mapGetters([`proposals`, `filters`, `bondingDenom`])
   },
   data: () => ({
-    tabs: [`Proposals`]
+    query: ``,
+    tabs: [`Proposals`],
+    showModalPropose: false
   }),
   methods: {
+    onPropose() {
+      this.showModalPropose = true
+    },
+    async propose({ title, description, type, amount }) {
+      try {
+        await this.$store.dispatch(`submitProposal`, {
+          title,
+          description,
+          type,
+          initial_deposit: [
+            {
+              denom: this.bondingDenom.toLowerCase(),
+              amount: String(amount)
+            }
+          ]
+        })
+        this.$store.commit(`notify`, {
+          title: `Successful proposal submission!`,
+          body: `You have successfully submitted a new ${type.toLowerCase()} proposal`
+        })
+      } catch ({ message }) {
+        this.$store.commit(`notifyError`, {
+          title: `Error while submitting a new ${type.toLowerCase()} proposal`,
+          body: message
+        })
+      }
+    },
     setSearch(bool = !this.filters[`proposals`].search.visible) {
       this.$store.commit(`setSearchVisible`, [`proposals`, bool])
     }
diff --git a/app/src/renderer/components/governance/PageProposal.vue b/app/src/renderer/components/governance/PageProposal.vue
index 13653e0423..13222e7a51 100644
--- a/app/src/renderer/components/governance/PageProposal.vue
+++ b/app/src/renderer/components/governance/PageProposal.vue
@@ -13,14 +13,14 @@ tm-page(data-title='Proposal')
           .top.column
             div.validator-profile__status-and-title
               span.validator-profile__status(v-bind:class="status.color" v-tooltip.top="status.message")
-              .validator-profile__header__name__title {{ proposal.title }}
+              .validator-profile__header__name__title {{ proposal.title }} {{ `(#` + proposal.proposal_id + `)`}}
           .column.validator-profile__header__actions
             tm-btn#vote-btn(v-if="status.button === 'vote'" value="Vote" color="primary" @click.native="onVote")
             tm-btn#deposit-btn(v-if="status.button === 'deposit'" value="Deposit" color="primary" @click.native="onDeposit")
             tm-btn(v-if="!status.button" disabled value="Deposit / Vote" color="primary")
 
         .row.description
-          p This {{ proposalType }} proposal ({{ `#` + proposal.proposal_id }}) was submitted at block {{ submitBlock }} and voting started at {{ voteBlock }}.
+          p Submitted {{ submittedAgo }}. {{ proposal.proposal_status === `DepositPeriod` ? `Deposit ends ` + depositEndsIn : `Voting started ` + votingStartedAgo }}
 
         .row.validator-profile__header__data.votes
           dl.colored_dl
@@ -47,10 +47,11 @@ tm-page(data-title='Proposal')
 
     modal-deposit(
       v-if="showModalDeposit"
-      v-on:castVote="deposit"
-      :showModalVote.sync="showModalVote"
+      v-on:submitDeposit="deposit"
+      :showModalDeposit.sync="showModalDeposit"
       :proposalId="proposal.proposal_id"
       :proposalTitle="proposal.title"
+      :denom="bondingDenom.toLowerCase()"
     )
 
     modal-vote(
@@ -63,6 +64,7 @@ tm-page(data-title='Proposal')
 </template>
 
 <script>
+import moment from "moment"
 import { mapGetters } from "vuex"
 import num from "scripts/num"
 import { TmBtn, TmPage, TmToolBar } from "@tendermint/ui"
@@ -92,15 +94,14 @@ export default {
     proposalType() {
       return this.proposal.proposal_type.toLowerCase()
     },
-    submitBlock() {
-      return `#` + num.prettyInt(this.proposal.submit_block)
+    submittedAgo() {
+      return moment(new Date(this.proposal.submit_time)).fromNow()
     },
-    voteBlock() {
-      if (this.proposal.submit_block === this.proposal.voting_start_block)
-        return `the same block`
-      else {
-        return `block #` + num.prettyInt(this.proposal.voting_start_block)
-      }
+    votingStartedAgo() {
+      return moment(new Date(this.proposal.voting_start_block)).fromNow()
+    },
+    depositEndsIn() {
+      return moment(new Date(this.proposal.deposit_end_time)).fromNow()
     },
     totalVotes() {
       return (
@@ -135,33 +136,27 @@ export default {
       this.showModalDeposit = true
     },
     async deposit({ amount }) {
-      let proposalId = this.proposal.proposal_id
-
+      let proposal_id = this.proposal.proposal_id
       try {
         // TODO: support multiple coins
-        await this.$store.dispatch(`submitDeposit`, { proposalId, amount })
+        await this.$store.dispatch(`submitDeposit`, { proposal_id, amount })
 
         // TODO: get min deposit denom from gov params
         this.$store.commit(`notify`, {
           title: `Successful deposit!`,
-          body: `You have successfully deposited your ${this.bondingDenom.toLowerCase()}s on proposal #${
-            this.proposal.proposal_id
-          }`
+          body: `You have successfully deposited your ${this.bondingDenom.toLowerCase()}s on proposal #${proposal_id}`
         })
       } catch ({ message }) {
         this.$store.commit(`notifyError`, {
-          title: `Error while submitting a deposit on proposal #${
-            this.proposal.proposal_id
-          }`,
+          title: `Error while submitting a deposit on proposal #${proposal_id}`,
           body: message
         })
       }
     },
     async castVote({ option }) {
-      let proposalId = this.proposal.proposal_id
-
+      let proposal_id = this.proposal.proposal_id
       try {
-        await this.$store.dispatch(`submitVote`, { proposalId, option })
+        await this.$store.dispatch(`submitVote`, { proposal_id, option })
 
         this.$store.commit(`notify`, {
           title: `Successful vote!`,
@@ -171,7 +166,7 @@ export default {
         })
       } catch ({ message }) {
         this.$store.commit(`notifyError`, {
-          title: `Error while voting on proposal #${this.proposal.proposal_id}`,
+          title: `Error while voting on proposal #${proposal_id}`,
           body: message
         })
       }
diff --git a/app/src/renderer/components/governance/PageProposalsNewText.vue b/app/src/renderer/components/governance/PageProposalsNewText.vue
deleted file mode 100644
index 0eed470428..0000000000
--- a/app/src/renderer/components/governance/PageProposalsNewText.vue
+++ /dev/null
@@ -1,109 +0,0 @@
-<template lang="pug">
-tm-page(data-title="Text Proposal")
-  div(slot="menu"): vm-tool-bar
-    router-link(to="/governance/proposals/new" exact v-tooltip.bottom="'Back'")
-      i.material-icons arrow_back
-  tm-form-struct(:submit="onSubmit")
-    tm-form-group(:error="$v.fields.title.$error"
-      field-id='proposal-title' field-label='Proposal Title')
-      tm-field#proposal-title(
-        type="text"
-        placeholder="Proposal Title"
-        v-model="fields.title")
-      tm-form-msg(name='Proposal Title' type='required'
-        v-if='!$v.fields.title.required')
-      tm-form-msg(name='Proposal Title' type='length'
-        :min='titleMinLength' :max='titleMaxLength'
-        v-if='!$v.fields.title.minLength || !$v.fields.title.maxLength')
-    tm-form-group(:error="$v.fields.body.$error"
-      field-id='proposal-body' field-label='Proposal Body')
-      tm-field#proposal-body(
-        type="textarea"
-        placeholder="Write your proposal here..."
-        v-model="fields.body")
-      tm-form-msg(name='Proposal Body' type='required'
-        v-if='!$v.fields.body.required')
-      tm-form-msg(name='Proposal Body' type='length'
-        :min='bodyMinLength' :max='bodyMaxLength'
-        v-if='!$v.fields.body.minLength || !$v.fields.body.maxLength')
-    div(slot="footer")
-      div
-      tm-btn(icon="send" value="Propose" type="submit")
-</template>
-
-<script>
-import { minLength, maxLength, required } from "vuelidate/lib/validators"
-import {
-  TmBtn,
-  TmFormGroup,
-  TmFormStruct,
-  TmPage,
-  TmField,
-  TmFormMsg
-} from "@tendermint/ui"
-
-import VmToolBar from "common/VmToolBar"
-export default {
-  name: `page-proposals-text`,
-  components: {
-    TmBtn,
-    TmField,
-    TmFormGroup,
-    TmFormMsg,
-    TmFormStruct,
-    TmPage,
-    VmToolBar
-  },
-  data: () => ({
-    titleMinLength: 10,
-    titleMaxLength: 254,
-    bodyMinLength: 10,
-    bodyMaxLength: 40000,
-    fields: {
-      title: ``,
-      body: ``
-    }
-  }),
-  methods: {
-    onSubmit() {
-      this.$v.$touch()
-      if (!this.$v.$error) {
-        this.$store.commit(`notify`, {
-          title: `TODO: Create Text Proposal`,
-          body: `You will have successfully created a text proposal`
-        })
-        this.resetForm()
-        this.$router.push({ name: `proposals` })
-      }
-    },
-    resetForm() {
-      this.fields = {
-        title: ``,
-        body: ``
-      }
-    }
-  },
-  validations: () => ({
-    fields: {
-      title: {
-        required,
-        minLength(x) {
-          return minLength(this.titleMinLength)(x)
-        },
-        maxLength(x) {
-          return maxLength(this.titleMaxLength)(x)
-        }
-      },
-      body: {
-        required,
-        minLength(x) {
-          return minLength(this.bodyMinLength)(x)
-        },
-        maxLength(x) {
-          return maxLength(this.bodyMaxLength)(x)
-        }
-      }
-    }
-  })
-}
-</script>
diff --git a/app/src/renderer/components/governance/TableProposals.vue b/app/src/renderer/components/governance/TableProposals.vue
index 80f6823fe7..d5dcfa189a 100644
--- a/app/src/renderer/components/governance/TableProposals.vue
+++ b/app/src/renderer/components/governance/TableProposals.vue
@@ -20,7 +20,6 @@ import { includes, orderBy } from "lodash"
 import LiProposal from "./LiProposal"
 import { TmDataEmpty, TmDataLoading } from "@tendermint/ui"
 import DataEmptySearch from "common/TmDataEmptySearch"
-import { ratToBigNumber } from "scripts/common"
 import ModalSearch from "common/TmModalSearch"
 import PanelSort from "staking/PanelSort"
 import VmToolBar from "common/VmToolBar"
@@ -54,18 +53,12 @@ export default {
 
       let copiedProposals = JSON.parse(JSON.stringify(this.proposals))
       return Object.values(copiedProposals).map(p => {
-        p.tally_result.yes = Math.round(
-          ratToBigNumber(p.tally_result.yes).toNumber()
-        )
-        p.tally_result.no = Math.round(
-          ratToBigNumber(p.tally_result.no).toNumber()
-        )
+        p.tally_result.yes = Math.round(parseFloat(p.tally_result.yes))
+        p.tally_result.no = Math.round(parseFloat(p.tally_result.no))
         p.tally_result.no_with_veto = Math.round(
-          ratToBigNumber(p.tally_result.no_with_veto).toNumber()
-        )
-        p.tally_result.abstain = Math.round(
-          ratToBigNumber(p.tally_result.abstain).toNumber()
+          parseFloat(p.tally_result.no_with_veto)
         )
+        p.tally_result.abstain = Math.round(parseFloat(p.tally_result.abstain))
         return p
       })
     },
@@ -95,10 +88,10 @@ export default {
           class: `proposal_title`
         },
         {
-          title: `Submitted Block`,
-          value: `submit_block`,
-          tooltip: `Block height when proposal was submitted`,
-          class: `submit_block`
+          title: `Proposal id`,
+          value: `proposal_id`,
+          tooltip: `Id of the proposal`,
+          class: `proposal_id`
         },
         {
           title: `Yes`,
@@ -141,7 +134,6 @@ export default {
     Mousetrap.bind([`command+f`, `ctrl+f`], () => this.setSearch(true))
     Mousetrap.bind([`command+n`, `ctrl+n`], () => this.newProposal())
     Mousetrap.bind(`esc`, () => this.setSearch(false))
-
     this.$store.dispatch(`getProposals`)
   }
 }
diff --git a/app/src/renderer/components/staking/PageStaking.vue b/app/src/renderer/components/staking/PageStaking.vue
index ee6e4054a8..f17fef20b5 100644
--- a/app/src/renderer/components/staking/PageStaking.vue
+++ b/app/src/renderer/components/staking/PageStaking.vue
@@ -3,11 +3,11 @@ tm-page(data-title="Staking").staking
   template(slot="menu-body")
     tm-balance(:tabs="tabs")
 
-  div(slot="menu"): vm-tool-bar
-    a(@click='connected && updateDelegates()' v-tooltip.bottom="'Refresh'" :disabled="!connected")
-      i.material-icons refresh
-    a(@click='setSearch()' v-tooltip.bottom="'Search'")
-      i.search.material-icons search
+    vm-tool-bar
+      a(@click='connected && updateDelegates()' v-tooltip.bottom="'Refresh'" :disabled="!connected")
+        i.material-icons refresh
+      a(@click='setSearch()' v-tooltip.bottom="'Search'")
+        i.search.material-icons search
 
   modal-search(type="delegates")
 
diff --git a/app/src/renderer/components/wallet/PageTransactions.vue b/app/src/renderer/components/wallet/PageTransactions.vue
index dda26ed415..186dce239a 100644
--- a/app/src/renderer/components/wallet/PageTransactions.vue
+++ b/app/src/renderer/components/wallet/PageTransactions.vue
@@ -1,7 +1,7 @@
 <template lang="pug">
 tm-page(data-title='Transactions')
-  template(slot="menu-body"): tm-balance
-  div(slot="menu")
+  template(slot="menu-body")
+    tm-balance
     vm-tool-bar
       a(@click='connected && refreshTransactions()' v-tooltip.bottom="'Refresh'" :disabled="!connected")
         i.material-icons refresh
diff --git a/app/src/renderer/components/wallet/PageWallet.vue b/app/src/renderer/components/wallet/PageWallet.vue
index cf64514de7..6b381d5bfe 100644
--- a/app/src/renderer/components/wallet/PageWallet.vue
+++ b/app/src/renderer/components/wallet/PageWallet.vue
@@ -1,7 +1,7 @@
 <template lang="pug">
 tm-page(data-title="Wallet")
-  template(slot="menu-body", v-if="config.devMode"): tm-balance
-  div(slot="menu")
+  template(slot="menu-body")
+    tm-balance
     vm-tool-bar
       a(@click='connected && updateBalances()' v-tooltip.bottom="'Refresh'" :disabled="!connected")
         i.material-icons refresh
diff --git a/app/src/renderer/routes.js b/app/src/renderer/routes.js
index ea6a021c01..3784c9f84a 100644
--- a/app/src/renderer/routes.js
+++ b/app/src/renderer/routes.js
@@ -21,10 +21,6 @@ export default [
       }
     ]
   },
-  {
-    path: `/governance/proposals/new`,
-    component: governance(`ProposalsNewText`)
-  },
   {
     path: `/governance/:proposalId`,
     name: `Proposal`,
diff --git a/app/src/renderer/styles/app.styl b/app/src/renderer/styles/app.styl
index cd3c760e8b..f2ed9e13af 100644
--- a/app/src/renderer/styles/app.styl
+++ b/app/src/renderer/styles/app.styl
@@ -107,6 +107,9 @@ input.tm-field
   border-width 1px
   padding 0 2rem
 
+.tm-page-header-body
+  position relative
+
 .tm-li-container
   margin-right 1rem
 
diff --git a/app/src/renderer/vuex/modules/delegation.js b/app/src/renderer/vuex/modules/delegation.js
index 9d46f93e99..0157a64ca4 100644
--- a/app/src/renderer/vuex/modules/delegation.js
+++ b/app/src/renderer/vuex/modules/delegation.js
@@ -222,38 +222,6 @@ export default ({ node }) => {
         dispatch(`updateDelegates`)
       }, 5000)
     }
-    // deprecated
-    // async endUnbonding({ rootState, state, dispatch, commit }, validatorAddr) {
-    //   try {
-    //     await dispatch(`sendTx`, {
-    //       type: `updateDelegations`,
-    //       to: rootState.wallet.address, // TODO strange syntax
-    //       complete_unbondings: [
-    //         {
-    //           delegator_addr: rootState.wallet.address,
-    //           validator_addr: validatorAddr
-    //         }
-    //       ]
-    //     })
-
-    //     let balance = state.unbondingDelegations[validatorAddr].balance
-    //     commit(`setUnbondingDelegations`, {
-    //       validator_addr: validatorAddr,
-    //       balance: { amount: 0 }
-    //     })
-    //     commit(`notify`, {
-    //       title: `Ending undelegation successful`,
-    //       body: `You successfully undelegated ${balance.amount} ${
-    //         balance.denom
-    //       }s from ${validatorAddr}`
-    //     })
-    //   } catch (err) {
-    //     commit(`notifyError`, {
-    //       title: `Ending undelegation failed`,
-    //       body: err
-    //     })
-    //   }
-    // }
   }
 
   return {
diff --git a/app/src/renderer/vuex/modules/governance/deposits.js b/app/src/renderer/vuex/modules/governance/deposits.js
index 98898ccfce..c07f29c6ca 100644
--- a/app/src/renderer/vuex/modules/governance/deposits.js
+++ b/app/src/renderer/vuex/modules/governance/deposits.js
@@ -20,27 +20,19 @@ export default ({ node }) => {
     },
     async submitDeposit(
       {
-        rootState: { config, wallet },
+        rootState: { wallet },
         dispatch
       },
-      proposalId,
-      depositAmount
+      { proposal_id, amount }
     ) {
-      const denom = config.bondingDenom.toLowerCase()
       await dispatch(`sendTx`, {
         type: `submitProposalDeposit`,
-        proposal_id: proposalId,
+        to: proposal_id,
+        proposal_id,
         depositer: wallet.address,
-        amount: [
-          {
-            denom: denom,
-            amount: depositAmount
-          }
-        ]
+        amount
       })
-      setTimeout(async () => {
-        dispatch(`getProposalDeposits`, proposalId)
-      }, 5000)
+      await dispatch(`getProposalDeposits`, proposal_id)
     }
   }
   return {
diff --git a/app/src/renderer/vuex/modules/governance/proposals.js b/app/src/renderer/vuex/modules/governance/proposals.js
index ffb030b92a..c27d1f5034 100644
--- a/app/src/renderer/vuex/modules/governance/proposals.js
+++ b/app/src/renderer/vuex/modules/governance/proposals.js
@@ -37,19 +37,17 @@ export default ({ node }) => {
         rootState: { wallet },
         dispatch
       },
-      proposal
+      { title, description, type, initial_deposit }
     ) {
       await dispatch(`sendTx`, {
         type: `submitProposal`,
         proposer: wallet.address,
-        proposal_type: proposal.proposal_type,
-        title: proposal.title,
-        description: proposal.description,
-        initial_deposit: proposal.initial_deposit
+        proposal_type: type,
+        title,
+        description,
+        initial_deposit
       })
-      setTimeout(async () => {
-        dispatch(`getProposals`)
-      }, 5000)
+      await dispatch(`getProposals`)
     }
   }
   return {
diff --git a/app/src/renderer/vuex/modules/governance/votes.js b/app/src/renderer/vuex/modules/governance/votes.js
index 25f04523a9..e24e35104c 100644
--- a/app/src/renderer/vuex/modules/governance/votes.js
+++ b/app/src/renderer/vuex/modules/governance/votes.js
@@ -18,14 +18,15 @@ export default ({ node }) => {
       commit(`setProposalVotes`, proposalId, votes)
       state.loading = false
     },
-    async submitVote({ rootState, dispatch }, proposalId, option) {
+    async submitVote({ rootState, dispatch }, { proposal_id, option }) {
       await dispatch(`sendTx`, {
+        to: proposal_id,
         type: `submitProposalVote`,
-        proposal_id: proposalId,
+        proposal_id,
         voter: rootState.wallet.address,
         option
       })
-      dispatch(`getProposalVotes`, proposalId)
+      await dispatch(`getProposalVotes`, proposal_id)
     }
   }
   return {
diff --git a/test/e2e/common.js b/test/e2e/common.js
index 8d6e0dab47..d47c76727c 100644
--- a/test/e2e/common.js
+++ b/test/e2e/common.js
@@ -11,6 +11,7 @@ function sleep(ms) {
 module.exports = {
   async closeNotifications(app) {
     // close notifications as they overlay the menu button
+    console.log(`closing notifications`)
     await sleep(100)
     while (await app.client.isExisting(`.tm-notification`)) {
       await app.client.$(`.tm-notification`).click()
@@ -61,6 +62,7 @@ module.exports = {
   async navigateToPreferences(app) {
     await module.exports.openMenu(app)
     // click link
+    await app.client.waitForExist(`#settings`, 1000)
     await app.client.$(`#settings`).click()
     console.log(`navigated to preferences`)
   },
diff --git a/test/e2e/launch.js b/test/e2e/launch.js
index 81130efd8e..2e70499993 100644
--- a/test/e2e/launch.js
+++ b/test/e2e/launch.js
@@ -232,6 +232,12 @@ async function writeLogs(app, location) {
 async function startApp(app, awaitingSelector = `.tm-session`) {
   console.log(`Starting app`)
   await app.start()
+  if (!app.browserWindow) {
+    console.log(`No browser window`)
+    return
+  }
+  app.browserWindow.setBounds({ x: 0, y: 0, width: 1600, height: 1024 })
+  app.browserWindow.setSize(1600, 1024)
 
   await app.client.waitForExist(awaitingSelector, 10 * 1000).catch(async e => {
     await handleCrash(app, e)
@@ -370,6 +376,8 @@ module.exports = {
     console.log(`restarting app`)
     await stop(app)
     await startApp(app, awaitingSelector)
+    app.browserWindow.setBounds({ x: 0, y: 0, width: 1600, height: 1024 })
+    app.browserWindow.setSize(1600, 1024)
   },
   refresh: async function(app, awaitingSelector = `.tm-session-title=Sign In`) {
     console.log(`refreshing app`)
diff --git a/test/e2e/signin.js b/test/e2e/signin.js
index 36e9bc9801..886f0b16b4 100644
--- a/test/e2e/signin.js
+++ b/test/e2e/signin.js
@@ -14,9 +14,10 @@ let { openMenu, login, sleep } = require(`./common.js`)
 
 test(`sign in`, async function(t) {
   let { app } = await getApp(t)
-
   await refresh(app)
   let el = (...args) => app.client.$(...args)
+  app.browserWindow.setBounds({ x: 0, y: 0, width: 1600, height: 1024 })
+  app.browserWindow.setSize(1600, 1024)
   // clicking the button does fail in webdriver as there is no actual click handler on the button
   async function clickContinue() {
     return app.client.submitForm(`.tm-session form`)
@@ -164,10 +165,11 @@ test(`sign in`, async function(t) {
 
   t.test(`sign out`, async function(t) {
     await refresh(app)
+    app.browserWindow.setBounds({ x: 0, y: 0, width: 1600, height: 1024 })
+    app.browserWindow.setSize(1600, 1024)
     await login(app, `testkey`)
     await app.client.waitForExist(`#signOut-btn`, 1000)
     await app.client.$(`#signOut-btn`).click()
-
     await app.client.waitForExist(`.tm-session`, 1000)
 
     t.end()
diff --git a/test/unit/specs/components/common/__snapshots__/PagePreferences.spec.js.snap b/test/unit/specs/components/common/__snapshots__/PagePreferences.spec.js.snap
index e3e0f4a20c..a952c6c688 100644
--- a/test/unit/specs/components/common/__snapshots__/PagePreferences.spec.js.snap
+++ b/test/unit/specs/components/common/__snapshots__/PagePreferences.spec.js.snap
@@ -16,66 +16,121 @@ exports[`PagePreferences has the expected html structure if connected 1`] = `
       >
         <!---->
         <!---->
-        <!---->
-      </div>
-      <menu
-        class="tm-page-header-menu"
-      >
-        <div>
-          <div>
+        <div
+          class="tm-page-header-body"
+        >
+          <div
+            class="header-balance"
+          >
             <div
-              class="tm-tool-bar"
+              class="top"
             >
               <div
-                class="tm-tool-bar-container"
+                class="icon-container"
               >
-                <div
-                  class="main"
+                <img
+                  class="icon"
+                  src="~assets/images/cosmos-logo.png"
+                />
+              </div>
+              <div
+                class="total-atoms top-section"
+              >
+                <h3>
+                  Total Steak
+                </h3>
+                <h2>
+                  1,000.0000…
+                </h2>
+              </div>
+              <div
+                class="unbonded-atoms top-section"
+              >
+                <h3>
+                  Available Steak
+                </h3>
+                <h2>
+                  1,000.0000…
+                </h2>
+              </div>
+              <!---->
+              <!---->
+            </div>
+            <div
+              class="short-bech32"
+            >
+              <div
+                class="address"
+                id="address"
+              >
+                cosmos…xxn9
+              </div>
+              <div
+                class="copied"
+              >
+                <i
+                  class="material-icons"
                 >
-                  <a
-                    class="back"
-                    disabled="disabled"
-                  >
-                    <i
-                      class="material-icons"
-                    >
-                      arrow_back
-                    </i>
-                  </a>
-                  <a
-                    class="help"
-                  >
-                    <i
-                      class="material-icons"
-                    >
-                      help_outline
-                    </i>
-                  </a>
-                  <a
-                    class="settings"
-                    href="#/preferences"
-                  >
-                    <i
-                      class="material-icons"
-                      id="settings"
-                    >
-                      settings
-                    </i>
-                  </a>
-                  <a
-                    id="signOut-btn"
-                  >
-                    <i
-                      class="material-icons"
-                    >
-                      exit_to_app
-                    </i>
-                  </a>
-                </div>
+                  check
+                </i>
+                <span>
+                  Copied
+                </span>
               </div>
             </div>
+            <div
+              class="tabs"
+            />
+          </div>
+          <div
+            class="tm-tool-bar"
+          >
+            <a
+              class="back"
+              disabled="disabled"
+            >
+              <i
+                class="material-icons"
+              >
+                arrow_back
+              </i>
+            </a>
+            <a
+              class="help"
+            >
+              <i
+                class="material-icons"
+              >
+                help_outline
+              </i>
+            </a>
+            <a
+              class=""
+              href="#/preferences"
+              id="settings"
+            >
+              <i
+                class="material-icons"
+              >
+                settings
+              </i>
+            </a>
+            <a
+              id="signOut-btn"
+            >
+              <i
+                class="material-icons"
+              >
+                exit_to_app
+              </i>
+            </a>
           </div>
         </div>
+      </div>
+      <menu
+        class="tm-page-header-menu"
+      >
+        <div />
       </menu>
     </div>
   </header>
diff --git a/test/unit/specs/components/common/__snapshots__/VmToolBar.spec.js.snap b/test/unit/specs/components/common/__snapshots__/VmToolBar.spec.js.snap
index 0405e15bfe..d82d7fd222 100644
--- a/test/unit/specs/components/common/__snapshots__/VmToolBar.spec.js.snap
+++ b/test/unit/specs/components/common/__snapshots__/VmToolBar.spec.js.snap
@@ -2,10 +2,6 @@
 
 exports[`VmToolBar has the expected html structure 1`] = `
 "<div class=\\"tm-tool-bar\\">
-   <div class=\\"tm-tool-bar-container\\">
-      <div class=\\"main\\">
-         <a disabled=\\"disabled\\" class=\\"back\\"><i class=\\"material-icons\\">arrow_back</i></a><a class=\\"help\\"><i class=\\"material-icons\\">help_outline</i></a><a href=\\"#/preferences\\" class=\\"settings\\"><i id=\\"settings\\" class=\\"material-icons\\">settings</i></a><a id=\\"signOut-btn\\"><i class=\\"material-icons\\">exit_to_app</i></a>
-      </div>
-</div>
+   <a disabled=\\"disabled\\" class=\\"back\\"><i class=\\"material-icons\\">arrow_back</i></a><a class=\\"help\\"><i class=\\"material-icons\\">help_outline</i></a><a href=\\"#/preferences\\" class=\\"\\" id=\\"settings\\"><i class=\\"material-icons\\">settings</i></a><a id=\\"signOut-btn\\"><i class=\\"material-icons\\">exit_to_app</i></a>
 </div>"
 `;
diff --git a/test/unit/specs/components/governance/ModalDeposit.spec.js b/test/unit/specs/components/governance/ModalDeposit.spec.js
index 8cbf764f26..65a26e405a 100644
--- a/test/unit/specs/components/governance/ModalDeposit.spec.js
+++ b/test/unit/specs/components/governance/ModalDeposit.spec.js
@@ -40,7 +40,7 @@ describe(`ModalDeposit`, () => {
   })
 
   describe(`default values are set correctly`, () => {
-    it(`the 'amount' defaults to an empty string`, () => {
+    it(`the 'amount' defaults to 0`, () => {
       expect(wrapper.vm.amount).toEqual(0)
     })
   })
@@ -101,7 +101,16 @@ describe(`ModalDeposit`, () => {
       expect(wrapper.emittedByOrder()).toEqual([
         {
           name: `submitDeposit`,
-          args: [{ amount: 10 }]
+          args: [
+            {
+              amount: [
+                {
+                  amount: `10`,
+                  denom: `stake`
+                }
+              ]
+            }
+          ]
         },
         {
           name: `update:showModalDeposit`,
diff --git a/test/unit/specs/components/governance/ModalPropose.spec.js b/test/unit/specs/components/governance/ModalPropose.spec.js
new file mode 100644
index 0000000000..847b90ab4d
--- /dev/null
+++ b/test/unit/specs/components/governance/ModalPropose.spec.js
@@ -0,0 +1,150 @@
+"use strict"
+
+import Vuelidate from "vuelidate"
+import setup from "../../../helpers/vuex-setup"
+import ModalPropose from "renderer/components/governance/ModalPropose"
+
+describe(`ModalPropose`, () => {
+  let wrapper, store
+  let { mount, localVue } = setup()
+  localVue.use(Vuelidate)
+
+  beforeEach(() => {
+    const coins = [
+      {
+        amount: `20`,
+        denom: `stake`
+      }
+    ]
+    let instance = mount(ModalPropose, {
+      localVue,
+      propsData: {
+        denom: `stake`
+      }
+    })
+    wrapper = instance.wrapper
+    store = instance.store
+    store.commit(`setWalletBalances`, coins)
+    wrapper.update()
+  })
+
+  describe(`component matches snapshot`, () => {
+    it(`has the expected html structure`, async () => {
+      await wrapper.vm.$nextTick()
+      wrapper.update()
+      expect(wrapper.vm.$el).toMatchSnapshot()
+    })
+  })
+
+  describe(`default values are set correctly`, () => {
+    it(`the proposal type defaults to 'Text'`, () => {
+      expect(wrapper.vm.type).toEqual(`Text`)
+    })
+
+    it(`the proposal title defaults to the empty string`, () => {
+      expect(wrapper.vm.title).toEqual(``)
+    })
+
+    it(`the proposal type defaults to the empty string`, () => {
+      expect(wrapper.vm.description).toEqual(``)
+    })
+
+    it(`the 'amount' defaults to 0`, () => {
+      expect(wrapper.vm.amount).toEqual(0)
+    })
+  })
+
+  describe(`enables or disables 'Create Proposal' button correctly`, () => {
+    describe(`disables the 'Create Proposal' button`, () => {
+      it(`with the default values`, () => {
+        let proposeBtn = wrapper.find(`#submit-proposal`)
+        expect(proposeBtn.html()).toContain(`disabled="disabled"`)
+      })
+
+      it(`if the amount for initial deposit is less than the user's balance`, () => {
+        wrapper.setData({ amount: 25 })
+        let proposeBtn = wrapper.find(`#submit-proposal`)
+        expect(proposeBtn.html()).toContain(`disabled="disabled"`)
+      })
+
+      it(`if the user doesn't have the deposit coin`, () => {
+        const otherCoins = [
+          {
+            amount: `20`,
+            denom: `otherCoin`
+          }
+        ]
+        store.commit(`setWalletBalances`, otherCoins)
+        wrapper.setData({ amount: 25 })
+        let proposeBtn = wrapper.find(`#submit-proposal`)
+        expect(proposeBtn.html()).toContain(`disabled="disabled"`)
+      })
+
+      it(`if title is blank`, () => {
+        wrapper.setData({ title: `     ` })
+        let proposeBtn = wrapper.find(`#submit-proposal`)
+        expect(proposeBtn.html()).toContain(`disabled="disabled"`)
+      })
+
+      it(`if description is blank`, () => {
+        wrapper.setData({ description: `     ` })
+        let proposeBtn = wrapper.find(`#submit-proposal`)
+        expect(proposeBtn.html()).toContain(`disabled="disabled"`)
+      })
+
+      it(`if proposal type is invalid`, () => {
+        wrapper.setData({ type: `Other` })
+        let proposeBtn = wrapper.find(`#submit-proposal`)
+        expect(proposeBtn.html()).toContain(`disabled="disabled"`)
+      })
+    })
+
+    describe(`enables the 'Create Proposal' button`, () => {
+      it(`if the user has enough balance and the fields are within the length ranges`, () => {
+        wrapper.setData({
+          amount: 15,
+          title: `A new text proposal for Cosmos`,
+          description: `a valid description for the proposal`
+        })
+        let submitButton = wrapper.find(`#submit-proposal`)
+        expect(submitButton.html()).not.toContain(`disabled="disabled"`)
+      })
+    })
+  })
+
+  describe(`closes modal correctly`, () => {
+    it(`X button emits close signal`, () => {
+      wrapper.vm.close()
+      expect(wrapper.emittedByOrder()).toEqual([
+        {
+          name: `update:showModalPropose`,
+          args: [false]
+        }
+      ])
+    })
+  })
+
+  describe(`Propose`, () => {
+    it(`'Create Proposal' button submits a new proposal and closes modal`, () => {
+      let proposalArgs = {
+        amount: 15,
+        title: `A new text proposal for Cosmos`,
+        description: `a valid description for the proposal`,
+        type: `Text`
+      }
+      wrapper.setData(proposalArgs)
+      wrapper.vm.onPropose()
+
+      expect(wrapper.emittedByOrder()).toEqual([
+        {
+          name: `createProposal`,
+          args: [proposalArgs]
+        },
+        {
+          name: `update:showModalPropose`,
+          args: [false]
+        }
+      ])
+    })
+  })
+})
diff --git a/test/unit/specs/components/governance/ModalVote.spec.js b/test/unit/specs/components/governance/ModalVote.spec.js
index 9a0aa92a39..8f3460e6ce 100644
--- a/test/unit/specs/components/governance/ModalVote.spec.js
+++ b/test/unit/specs/components/governance/ModalVote.spec.js
@@ -48,23 +48,23 @@ describe(`ModalVote`, () => {
     })
 
     it(`enables the 'Vote' button if the user selected a valid option`, () => {
-      wrapper.setData({ option: `yes` })
+      wrapper.setData({ option: `Yes` })
       let voteBtn = wrapper.find(`#vote-yes`)
       let submitButton = wrapper.find(`#cast-vote`)
       expect(voteBtn.html()).toContain(`active`)
       expect(submitButton.html()).not.toContain(`disabled="disabled"`)
 
-      wrapper.setData({ option: `no` })
+      wrapper.setData({ option: `No` })
       voteBtn = wrapper.find(`#vote-no`)
       expect(voteBtn.html()).toContain(`active`)
       expect(submitButton.html()).not.toContain(`disabled="disabled"`)
 
-      wrapper.setData({ option: `no_with_veto` })
+      wrapper.setData({ option: `NoWithVeto` })
       voteBtn = wrapper.find(`#vote-veto`)
       expect(voteBtn.html()).toContain(`active`)
       expect(submitButton.html()).not.toContain(`disabled="disabled"`)
 
-      wrapper.setData({ option: `abstain` })
+      wrapper.setData({ option: `Abstain` })
       voteBtn = wrapper.find(`#vote-abstain`)
       expect(voteBtn.html()).toContain(`active`)
       expect(submitButton.html()).not.toContain(`disabled="disabled"`)
@@ -86,30 +86,30 @@ describe(`ModalVote`, () => {
 
   describe(`Vote`, () => {
     it(`updates the selected option on click`, () => {
-      wrapper.vm.vote(`yes`)
-      expect(wrapper.vm.option).toEqual(`yes`)
+      wrapper.vm.vote(`Yes`)
+      expect(wrapper.vm.option).toEqual(`Yes`)
 
-      wrapper.vm.vote(`no`)
-      expect(wrapper.vm.option).toEqual(`no`)
+      wrapper.vm.vote(`No`)
+      expect(wrapper.vm.option).toEqual(`No`)
 
-      wrapper.vm.vote(`no_with_veto`)
-      expect(wrapper.vm.option).toEqual(`no_with_veto`)
+      wrapper.vm.vote(`NoWithVeto`)
+      expect(wrapper.vm.option).toEqual(`NoWithVeto`)
 
-      wrapper.vm.vote(`abstain`)
-      expect(wrapper.vm.option).toEqual(`abstain`)
+      wrapper.vm.vote(`Abstain`)
+      expect(wrapper.vm.option).toEqual(`Abstain`)
 
-      wrapper.vm.vote(`abstain`)
+      wrapper.vm.vote(`Abstain`)
       expect(wrapper.vm.option).toEqual(``)
     })
 
     it(`Vote button casts a vote and closes modal`, () => {
-      wrapper.setData({ option: `yes` })
+      wrapper.setData({ option: `Yes` })
       wrapper.vm.onVote()
 
       expect(wrapper.emittedByOrder()).toEqual([
         {
           name: `castVote`,
-          args: [{ option: `yes` }]
+          args: [{ option: `Yes` }]
         },
         {
           name: `update:showModalVote`,
diff --git a/test/unit/specs/components/governance/PageGovernance.spec.js b/test/unit/specs/components/governance/PageGovernance.spec.js
index a213ff1c8b..b549fb9126 100644
--- a/test/unit/specs/components/governance/PageGovernance.spec.js
+++ b/test/unit/specs/components/governance/PageGovernance.spec.js
@@ -2,35 +2,159 @@ import setup from "../../../helpers/vuex-setup"
 import htmlBeautify from "html-beautify"
 import Vuelidate from "vuelidate"
 import PageGovernance from "renderer/components/governance/PageGovernance"
+import ModalPropose from "renderer/components/governance/ModalPropose"
 import lcdClientMock from "renderer/connectors/lcdClientMock.js"
+import { mount } from "@vue/test-utils"
+
+const proposal = {
+  amount: 15,
+  title: `A new text proposal for Cosmos`,
+  description: `a valid description for the proposal`,
+  type: `Text`
+}
 
 describe(`PageGovernance`, () => {
-  let wrapper, store
-  let { mount, localVue } = setup()
-  localVue.use(Vuelidate)
-
-  beforeEach(() => {
-    let instance = mount(PageGovernance)
-    wrapper = instance.wrapper
-    store = instance.store
-    store.commit(`setConnected`, true)
-    store.state.user.address = lcdClientMock.addresses[0]
-    store.commit(`setAtoms`, 1337)
-    wrapper.update()
-  })
+  describe(`with magic`, () => {
+    let wrapper, store
+    let { mount, localVue } = setup()
+    localVue.use(Vuelidate)
+
+    beforeEach(() => {
+      let instance = mount(PageGovernance)
+      wrapper = instance.wrapper
+      store = instance.store
+      store.commit(`setConnected`, true)
+      store.state.user.address = lcdClientMock.addresses[0]
+      store.commit(`setAtoms`, 1337)
+      wrapper.update()
+    })
+
+    it(`should show the search on click`, () => {
+      wrapper.find(`.tm-tool-bar i.search`).trigger(`click`)
+      expect(wrapper.contains(`.tm-modal-search`)).toBe(true)
+    })
 
-  it(`has the expected html structure`, async () => {
-    // after importing the @tendermint/ui components from modules
-    // the perfect scroll plugin needs a $nextTick and a wrapper.update
-    // to work properly in the tests (snapshots weren't matching)
-    // this has occured across multiple tests
-    await wrapper.vm.$nextTick()
-    wrapper.update()
-    expect(htmlBeautify(wrapper.html())).toMatchSnapshot()
+    describe(`Modal onPropose modal on click`, () => {
+      it(`displays the Propose modal`, () => {
+        let proposeBtn = wrapper.find(`#propose-btn`)
+        proposeBtn.trigger(`click`)
+        expect(wrapper.contains(ModalPropose)).toEqual(true)
+      })
+    })
   })
 
-  it(`should show the search on click`, () => {
-    wrapper.find(`.tm-tool-bar i.search`).trigger(`click`)
-    expect(wrapper.contains(`.tm-modal-search`)).toBe(true)
+  describe(`without magic`, () => {
+    const mountWrapper = (
+      { commit, dispatch } = { commit: jest.fn(), dispatch: jest.fn() }
+    ) => {
+      let $store = {
+        commit,
+        dispatch,
+        getters: {
+          lastHeader: null,
+          lastPage: null,
+          proposals: lcdClientMock.state.proposals,
+          filters: {
+            proposals: {
+              search: {
+                visible: false,
+                query: ``
+              }
+            }
+          },
+          bondingDenom: `Stake`,
+          totalAtoms: 100,
+          user: { atoms: 42, history: [] }
+        }
+      }
+
+      return mount(PageGovernance, {
+        mocks: {
+          $store,
+          $route: {
+            name: `Governance`,
+            path: `/governance`,
+            fullPath: `/governance`
+          }
+        }
+      })
+    }
+
+    it(`has the expected html structure`, async () => {
+      // after importing the @tendermint/ui components from modules
+      // the perfect scroll plugin needs a $nextTick and a wrapper.update
+      // to work properly in the tests (snapshots weren't matching)
+      // this has occured across multiple tests
+      const wrapper = mountWrapper()
+      await wrapper.vm.$nextTick()
+      wrapper.update()
+      expect(htmlBeautify(wrapper.html())).toMatchSnapshot()
+    })
+
+    describe(`Propose`, () => {
+      describe(`unit`, () => {
+        it(`success`, async () => {
+          const commit = jest.fn()
+          const dispatch = jest.fn()
+          const wrapper = mountWrapper({ commit, dispatch })
+          await wrapper.vm.propose(proposal)
+
+          expect(dispatch.mock.calls).toEqual([
+            [
+              `submitProposal`,
+              {
+                description: `a valid description for the proposal`,
+                initial_deposit: [{ amount: `15`, denom: `stake` }],
+                title: `A new text proposal for Cosmos`,
+                type: `Text`
+              }
+            ]
+          ])
+
+          expect(commit.mock.calls).toEqual([
+            [
+              `notify`,
+              {
+                body: `You have successfully submitted a new text proposal`,
+                title: `Successful proposal submission!`
+              }
+            ]
+          ])
+        })
+
+        it(`error`, async () => {
+          const commit = jest.fn()
+
+          const dispatch = jest.fn(() => {
+            throw new Error(`unexpected error`)
+          })
+
+          const wrapper = mountWrapper({ commit, dispatch })
+          await wrapper.vm.propose(proposal)
+
+          expect(dispatch.mock.calls).toEqual([
+            [
+              `submitProposal`,
+              {
+                description: `a valid description for the proposal`,
+                initial_deposit: [{ amount: `15`, denom: `stake` }],
+                title: `A new text proposal for Cosmos`,
+                type: `Text`
+              }
+            ]
+          ])
+
+          expect(commit.mock.calls).toEqual([
+            [
+              `notifyError`,
+              {
+                body: `unexpected error`,
+                title: `Error while submitting a new text proposal`
+              }
+            ]
+          ])
+        })
+      })
+    })
   })
 })
diff --git a/test/unit/specs/components/governance/PageProposal.spec.js b/test/unit/specs/components/governance/PageProposal.spec.js
index ee1275b71f..7f18e07451 100644
--- a/test/unit/specs/components/governance/PageProposal.spec.js
+++ b/test/unit/specs/components/governance/PageProposal.spec.js
@@ -1,5 +1,6 @@
 "use strict"
 
+import moment from "moment"
 import Vuelidate from "vuelidate"
 import setup from "../../../helpers/vuex-setup"
 import PageProposal from "renderer/components/governance/PageProposal"
@@ -49,20 +50,22 @@ describe(`PageProposal`, () => {
       expect(wrapper.vm.$el).toMatchSnapshot()
     })
 
-    it(`should return the block number`, () => {
-      expect(wrapper.vm.voteBlock).toBe(`block #135`)
+    it(`should return the time of submission `, () => {
+      expect(wrapper.vm.submittedAgo).toEqual(
+        moment(new Date(proposal.submit_time)).fromNow()
+      )
     })
 
-    it(`should return the end of the sentence`, () => {
-      proposal.submit_block = `135`
-      let { wrapper } = mount(PageProposal, {
-        propsData: {
-          proposal,
-          status
-        }
-      })
-      wrapper.update()
-      expect(wrapper.vm.voteBlock).toBe(`the same block`)
+    it(`should return the time that voting started`, () => {
+      expect(wrapper.vm.votingStartedAgo).toEqual(
+        moment(new Date(proposal.voting_start_block)).fromNow()
+      )
+    })
+
+    it(`should return the time when deposits end`, () => {
+      expect(wrapper.vm.depositEndsIn).toEqual(
+        moment(new Date(proposal.deposit_end_time)).fromNow()
+      )
     })
 
     describe(`Modal onVote`, () => {
@@ -124,17 +127,17 @@ describe(`PageProposal`, () => {
             }
           })
 
-          await wrapper.vm.castVote({ option: `no_with_veto` })
+          await wrapper.vm.castVote({ option: `NoWithVeto` })
 
           expect($store.dispatch.mock.calls).toEqual([
-            [`submitVote`, { option: `no_with_veto`, proposalId: `1` }]
+            [`submitVote`, { option: `NoWithVeto`, proposal_id: `1` }]
           ])
 
           expect($store.commit.mock.calls).toEqual([
             [
               `notify`,
               {
-                body: `You have successfully voted no_with_veto on proposal #1`,
+                body: `You have successfully voted NoWithVeto on proposal #1`,
                 title: `Successful vote!`
               }
             ]
@@ -164,10 +167,10 @@ describe(`PageProposal`, () => {
             }
           })
 
-          await wrapper.vm.castVote({ option: `abstain` })
+          await wrapper.vm.castVote({ option: `Abstain` })
 
           expect($store.dispatch.mock.calls).toEqual([
-            [`submitVote`, { option: `abstain`, proposalId: `1` }]
+            [`submitVote`, { option: `Abstain`, proposal_id: `1` }]
           ])
 
           expect($store.commit.mock.calls).toEqual([
@@ -204,10 +207,23 @@ describe(`PageProposal`, () => {
             }
           })
 
-          await wrapper.vm.deposit({ amount: 15 })
+          let amount = [
+            {
+              amount: `15`,
+              denom: `atom`
+            }
+          ]
+
+          await wrapper.vm.deposit({ amount })
 
           expect($store.dispatch.mock.calls).toEqual([
-            [`submitDeposit`, { amount: 15, proposalId: `2` }]
+            [
+              `submitDeposit`,
+              {
+                amount,
+                proposal_id: `2`
+              }
+            ]
           ])
 
           expect($store.commit.mock.calls).toEqual([
@@ -243,11 +259,23 @@ describe(`PageProposal`, () => {
               status: { message: `message` }
             }
           })
+          let amount = [
+            {
+              amount: `9`,
+              denom: `atom`
+            }
+          ]
 
-          await wrapper.vm.deposit({ amount: 9 })
+          await wrapper.vm.deposit({ amount })
 
           expect($store.dispatch.mock.calls).toEqual([
-            [`submitDeposit`, { amount: 9, proposalId: `2` }]
+            [
+              `submitDeposit`,
+              {
+                amount,
+                proposal_id: `2`
+              }
+            ]
           ])
 
           expect($store.commit.mock.calls).toEqual([
diff --git a/test/unit/specs/components/governance/__snapshots__/LiProposal.spec.js.snap b/test/unit/specs/components/governance/__snapshots__/LiProposal.spec.js.snap
index 1539437151..1ccd349d10 100644
--- a/test/unit/specs/components/governance/__snapshots__/LiProposal.spec.js.snap
+++ b/test/unit/specs/components/governance/__snapshots__/LiProposal.spec.js.snap
@@ -23,7 +23,7 @@ exports[`LiProposal has the expected html structure 1`] = `
     </p>
   </td>
   <td>
-    #120
+    #1
   </td>
   <td
     class="li-proposal__value yes"
diff --git a/test/unit/specs/components/governance/__snapshots__/ModalPropose.spec.js.snap b/test/unit/specs/components/governance/__snapshots__/ModalPropose.spec.js.snap
new file mode 100644
index 0000000000..edb7a25636
--- /dev/null
+++ b/test/unit/specs/components/governance/__snapshots__/ModalPropose.spec.js.snap
@@ -0,0 +1,118 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`ModalPropose component matches snapshot has the expected html structure 1`] = `
+<div
+  class="modal-propose"
+  id="modal-propose"
+>
+  <div
+    class="modal-propose-header"
+  >
+    <img
+      class="icon modal-propose-atom"
+      src="~assets/images/cosmos-logo.png"
+    />
+    <span
+      class="tm-modal-title"
+    >
+      Create Proposal
+    </span>
+    <div
+      class="tm-modal-icon tm-modal-close"
+      id="closeBtn"
+    >
+      <i
+        class="material-icons"
+      >
+        close
+      </i>
+    </div>
+  </div>
+  <div
+    class="page-proposal-form-group tm-form-group"
+  >
+    <!---->
+    <!---->
+    <div
+      class="tm-form-group__field"
+    >
+      <span>
+        Title
+      </span>
+      <input
+        class="tm-field"
+        id="title"
+        placeholder="Proposal title"
+        type="text"
+      />
+    </div>
+  </div>
+  <div
+    class="page-proposal-form-group tm-form-group"
+  >
+    <!---->
+    <!---->
+    <div
+      class="tm-form-group__field"
+    >
+      <span>
+        Description
+      </span>
+      <textarea
+        class="tm-field"
+        id="description"
+        placeholder="Write your proposal here..."
+      />
+    </div>
+  </div>
+  <div
+    class="modal-propose-form-group tm-form-group"
+  >
+    <!---->
+    <!---->
+    <div
+      class="tm-form-group__field"
+    >
+      <span>
+        Deposit amount
+      </span>
+      <input
+        class="tm-field"
+        id="denom"
+        placeholder="stake"
+        readonly="readonly"
+        type="text"
+      />
+      <input
+        class="tm-field"
+        id="amount"
+        max="20"
+        min="0"
+        step="any"
+        type="number"
+      />
+    </div>
+  </div>
+  <div
+    class="modal-propose-footer"
+  >
+    <button
+      class="tm-btn"
+      disabled="disabled"
+      id="submit-proposal"
+    >
+      <span
+        class="tm-btn__container tm-btn--size-lg tm-btn--primary"
+      >
+        <!---->
+        <!---->
+        <span
+          class="tm-btn__value"
+        >
+          Submit proposal
+        </span>
+      </span>
+    </button>
+  </div>
+</div>
+`;
diff --git a/test/unit/specs/components/governance/__snapshots__/PageGovernance.spec.js.snap b/test/unit/specs/components/governance/__snapshots__/PageGovernance.spec.js.snap
index 602c057c29..729f85b849 100644
--- a/test/unit/specs/components/governance/__snapshots__/PageGovernance.spec.js.snap
+++ b/test/unit/specs/components/governance/__snapshots__/PageGovernance.spec.js.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`PageGovernance has the expected html structure 1`] = `
+exports[`PageGovernance without magic has the expected html structure 1`] = `
 "<div class=\\"tm-page governance\\" data-title=\\"Governance\\">
    <header class=\\"tm-page-header\\">
       <div class=\\"tm-page-header-container\\">
@@ -15,18 +15,18 @@ exports[`PageGovernance has the expected html structure 1`] = `
                      </div>
    <div class=\\"total-atoms top-section\\">
       <h3>
-         Total Steak
+         Total Stake
       </h3>
       <h2>
-         1,351.0000…
+         100.0000…
       </h2>
 </div>
    <div class=\\"unbonded-atoms top-section\\">
       <h3>
-         Available Steak
+         Available Stake
       </h3>
       <h2>
-         1,337.0000…
+         42.0000…
       </h2>
 </div>
       <!---->
@@ -34,7 +34,7 @@ exports[`PageGovernance has the expected html structure 1`] = `
 </div>
    <div class=\\"short-bech32\\">
       <div id=\\"address\\" class=\\"address\\">
-         cosmos…xxn9
+         Address Not Found
       </div>
    <div class=\\"copied\\">
       <i class=\\"material-icons\\">check</i><span>Copied</span>
@@ -42,148 +42,39 @@ exports[`PageGovernance has the expected html structure 1`] = `
 </div>
    <div class=\\"tabs\\">
       <div class=\\"tab\\">
-         <a href=\\"#/governance/proposals\\" class=\\"\\">Proposals</a>
-      </div>
+         <router-link to=\\"[object Object]\\">
+            Proposals
+         </router-link>
 </div>
 </div>
+   <button class=\\"tm-btn\\" id=\\"propose-btn\\"><span class=\\"tm-btn__container tm-btn--primary\\">
+   <!---->
+   <!---->
+   <span class=\\"tm-btn__value\\">Create Proposal</span></span></button>
+</div>
+   <div class=\\"tm-tool-bar\\">
+      <a disabled=\\"disabled\\" class=\\"back\\"><i class=\\"material-icons\\">arrow_back</i></a><a><i class=\\"search material-icons\\">search</i></a><a class=\\"help\\"><i class=\\"material-icons\\">help_outline</i></a>
+      <router-link id=\\"settings\\" to=\\"/preferences\\">
+         <i class=\\"material-icons\\">settings</i>
+      </router-link>
+      <a id=\\"signOut-btn\\"><i class=\\"material-icons\\">exit_to_app</i></a>
+   </div>
 </div>
 </div>
    <menu class=\\"tm-page-header-menu\\">
-      <div>
-         <div>
-            <div class=\\"tm-tool-bar\\">
-               <div class=\\"tm-tool-bar-container\\">
-                  <div class=\\"main\\">
-                     <a disabled=\\"disabled\\" class=\\"back\\"><i class=\\"material-icons\\">arrow_back</i></a><a href=\\"#/governance/proposals/new\\" class=\\"\\"><i class=\\"material-icons\\">add</i></a><a><i class=\\"search material-icons\\">search</i></a><a class=\\"help\\"><i class=\\"material-icons\\">help_outline</i></a><a href=\\"#/preferences\\" class=\\"settings\\"><i id=\\"settings\\" class=\\"material-icons\\">settings</i></a><a id=\\"signOut-btn\\"><i class=\\"material-icons\\">exit_to_app</i></a>
-                  </div>
-</div>
-</div>
-</div>
-</div>
+      <div></div>
 </menu>
 </div>
 </header>
 <main class=\\"tm-page-main ps\\">
    <!---->
-   <div class=\\"tm-page\\" data-title=\\"Wallet\\">
-      <header class=\\"tm-page-header\\">
-         <div class=\\"tm-page-header-container\\">
-            <div class=\\"tm-page-header-text\\">
-               <!---->
-               <!---->
-               <div class=\\"tm-page-header-body\\">
-                  <div class=\\"header-balance\\">
-                     <div class=\\"top\\">
-                        <div class=\\"icon-container\\">
-                           <img src=\\"~assets/images/cosmos-logo.png\\" class=\\"icon\\">
-                        </div>
-      <div class=\\"total-atoms top-section\\">
-         <h3>
-            Total Steak
-         </h3>
-         <h2>
-            1,351.0000…
-         </h2>
-</div>
-      <div class=\\"unbonded-atoms top-section\\">
-         <h3>
-            Available Steak
-         </h3>
-         <h2>
-            1,337.0000…
-         </h2>
-</div>
-         <!---->
-         <!---->
-   </div>
-      <div class=\\"short-bech32\\">
-         <div id=\\"address\\" class=\\"address\\">
-            cosmos…xxn9
-         </div>
-      <div class=\\"copied\\">
-         <i class=\\"material-icons\\">check</i><span>Copied</span>
-      </div>
-</div>
-      <div class=\\"tabs\\"></div>
-</div>
-</div>
-</div>
-      <menu class=\\"tm-page-header-menu\\">
-         <div>
-            <div>
-               <div class=\\"tm-tool-bar\\">
-                  <div class=\\"tm-tool-bar-container\\">
-                     <div class=\\"main\\">
-                        <a disabled=\\"disabled\\" class=\\"back\\"><i class=\\"material-icons\\">arrow_back</i></a><a><i class=\\"material-icons\\">refresh</i></a><a disabled=\\"disabled\\"><i class=\\"material-icons\\">search</i></a><a class=\\"help\\"><i class=\\"material-icons\\">help_outline</i></a><a href=\\"#/preferences\\" class=\\"settings\\"><i id=\\"settings\\" class=\\"material-icons\\">settings</i></a><a id=\\"signOut-btn\\"><i class=\\"material-icons\\">exit_to_app</i></a>
-                     </div>
-</div>
-</div>
-</div>
-</div>
-</menu>
-</div>
-</header>
-   <main class=\\"tm-page-main ps\\">
-      <!---->
-      <section class=\\"tm-part\\">
-         <div class=\\"tm-part-container\\">
-            <header class=\\"tm-part-header\\">
-               <div class=\\"tm-part-header-container\\">
-                  <div class=\\"tm-part-title h5\\">
-                     Your Address
-                  </div>
-            <menu class=\\"tm-part-menu\\"></menu>
-</div>
-</header>
-         <main class=\\"tm-part-main\\">
-            <!---->
-         </main>
-</div>
-</section>
-<section class=\\"tm-part\\" id=\\"part-available-balances\\">
-   <div class=\\"tm-part-container\\">
-      <header class=\\"tm-part-header\\">
-         <div class=\\"tm-part-header-container\\">
-            <div class=\\"tm-part-title h5\\">
-               Available Balances
-            </div>
-      <menu class=\\"tm-part-menu\\"></menu>
-</div>
-</header>
-   <main class=\\"tm-part-main\\">
-      <div class=\\"tm-data-msg\\">
-         <div class=\\"tm-data-msg__icon\\">
-            <i class=\\"material-icons fa-spin\\">rotate_right</i>
-         </div>
-      <div class=\\"tm-data-msg__text\\">
-         <div class=\\"tm-data-msg__title\\">
-            <div>
-               Data is loading…
-            </div>
-</div>
-      <div class=\\"tm-data-msg__subtitle\\">
-         <div>
-            Please wait a moment.
-         </div>
-</div>
-</div>
-</div>
-</main>
-</div>
-</section>
-<div class=\\"ps__rail-x\\" style=\\"left: 0px; top: 0px;\\">
-   <div class=\\"ps__thumb-x\\" tabindex=\\"0\\" style=\\"left: 0px; width: 0px;\\"></div>
-</div>
-<div class=\\"ps__rail-y\\" style=\\"top: 0px; left: 0px;\\">
-   <div class=\\"ps__thumb-y\\" tabindex=\\"0\\" style=\\"top: 0px; height: 0px;\\"></div>
-</div>
-</main>
-</div>
-<div class=\\"ps__rail-x\\" style=\\"left: 0px; top: 0px;\\">
-   <div class=\\"ps__thumb-x\\" tabindex=\\"0\\" style=\\"left: 0px; width: 0px;\\"></div>
+   <!---->
+   <router-view></router-view>
+   <div class=\\"ps__rail-x\\" style=\\"left: 0px; top: 0px;\\">
+      <div class=\\"ps__thumb-x\\" tabindex=\\"0\\" style=\\"left: 0px; width: 0px;\\"></div>
 </div>
-<div class=\\"ps__rail-y\\" style=\\"top: 0px; left: 0px;\\">
-   <div class=\\"ps__thumb-y\\" tabindex=\\"0\\" style=\\"top: 0px; height: 0px;\\"></div>
+   <div class=\\"ps__rail-y\\" style=\\"top: 0px; left: 0px;\\">
+      <div class=\\"ps__thumb-y\\" tabindex=\\"0\\" style=\\"top: 0px; height: 0px;\\"></div>
 </div>
 </main>
 </div>"
diff --git a/test/unit/specs/components/governance/__snapshots__/PageProposal.spec.js.snap b/test/unit/specs/components/governance/__snapshots__/PageProposal.spec.js.snap
index 08b8434499..b4abc47009 100644
--- a/test/unit/specs/components/governance/__snapshots__/PageProposal.spec.js.snap
+++ b/test/unit/specs/components/governance/__snapshots__/PageProposal.spec.js.snap
@@ -140,7 +140,7 @@ exports[`PageProposal with magic has the expected html structure 1`] = `
               <div
                 class="validator-profile__header__name__title"
               >
-                Proposal Title
+                Proposal Title (#1)
               </div>
             </div>
           </div>
@@ -171,7 +171,7 @@ exports[`PageProposal with magic has the expected html structure 1`] = `
           class="row description"
         >
           <p>
-            This text proposal (#1) was submitted at block #120 and voting started at block #135.
+            Submitted a few seconds ago. Voting started a few seconds ago
           </p>
         </div>
         <div
diff --git a/test/unit/specs/components/governance/__snapshots__/TabProposals.spec.js.snap b/test/unit/specs/components/governance/__snapshots__/TabProposals.spec.js.snap
index b33b679f4f..329237f130 100644
--- a/test/unit/specs/components/governance/__snapshots__/TabProposals.spec.js.snap
+++ b/test/unit/specs/components/governance/__snapshots__/TabProposals.spec.js.snap
@@ -8,8 +8,8 @@ exports[`TabProposals has the expected html structure 1`] = `
             <th class=\\"sort-by proposal_title\\">
                <a class=\\"sort-by-link\\">Title</a>
             </th>
-            <th class=\\"sort-by submit_block\\">
-               <a class=\\"sort-by-link\\">Submitted Block</a>
+            <th class=\\"sort-by proposal_id\\">
+               <a class=\\"sort-by-link\\">Proposal id</a>
             </th>
             <th class=\\"sort-by yes_votes\\">
                <a class=\\"sort-by-link\\">Yes</a>
@@ -37,7 +37,7 @@ exports[`TabProposals has the expected html structure 1`] = `
                </p>
 </td>
             <td>
-               #10
+               #5
             </td>
             <td class=\\"li-proposal__value yes\\">
                0
@@ -63,7 +63,7 @@ exports[`TabProposals has the expected html structure 1`] = `
                </p>
 </td>
             <td>
-               #10
+               #2
             </td>
             <td class=\\"li-proposal__value yes\\">
                0
@@ -89,7 +89,7 @@ exports[`TabProposals has the expected html structure 1`] = `
                </p>
 </td>
             <td>
-               #120
+               #1
             </td>
             <td class=\\"li-proposal__value yes\\">
                500
diff --git a/test/unit/specs/components/governance/__snapshots__/TableProposals.spec.js.snap b/test/unit/specs/components/governance/__snapshots__/TableProposals.spec.js.snap
index 02a2e66c2c..bbf4b7c8f3 100644
--- a/test/unit/specs/components/governance/__snapshots__/TableProposals.spec.js.snap
+++ b/test/unit/specs/components/governance/__snapshots__/TableProposals.spec.js.snap
@@ -8,8 +8,8 @@ exports[`TableProposals has the expected html structure 1`] = `
             <th class=\\"sort-by proposal_title\\">
                <a class=\\"sort-by-link\\">Title</a>
             </th>
-            <th class=\\"sort-by submit_block\\">
-               <a class=\\"sort-by-link\\">Submitted Block</a>
+            <th class=\\"sort-by proposal_id\\">
+               <a class=\\"sort-by-link\\">Proposal id</a>
             </th>
             <th class=\\"sort-by yes_votes\\">
                <a class=\\"sort-by-link\\">Yes</a>
@@ -37,7 +37,7 @@ exports[`TableProposals has the expected html structure 1`] = `
                </p>
 </td>
             <td>
-               #10
+               #5
             </td>
             <td class=\\"li-proposal__value yes\\">
                0
@@ -63,7 +63,7 @@ exports[`TableProposals has the expected html structure 1`] = `
                </p>
 </td>
             <td>
-               #10
+               #2
             </td>
             <td class=\\"li-proposal__value yes\\">
                0
@@ -89,7 +89,7 @@ exports[`TableProposals has the expected html structure 1`] = `
                </p>
 </td>
             <td>
-               #120
+               #1
             </td>
             <td class=\\"li-proposal__value yes\\">
                500
@@ -126,12 +126,12 @@ exports[`TableProposals should filter the proposals 1`] = `
           </a>
         </th>
         <th
-          class="sort-by submit_block"
+          class="sort-by proposal_id"
         >
           <a
             class="sort-by-link"
           >
-            Submitted Block
+            Proposal id
           </a>
         </th>
         <th
@@ -195,7 +195,7 @@ exports[`TableProposals should filter the proposals 1`] = `
           </p>
         </td>
         <td>
-          #10
+          #5
         </td>
         <td
           class="li-proposal__value yes"
diff --git a/test/unit/specs/components/staking/__snapshots__/PageStaking.spec.js.snap b/test/unit/specs/components/staking/__snapshots__/PageStaking.spec.js.snap
index 3b69b1cc7d..b9788d677b 100644
--- a/test/unit/specs/components/staking/__snapshots__/PageStaking.spec.js.snap
+++ b/test/unit/specs/components/staking/__snapshots__/PageStaking.spec.js.snap
@@ -49,20 +49,13 @@ exports[`PageStaking has the expected html structure 1`] = `
    </div>
 </div>
 </div>
+   <div class=\\"tm-tool-bar\\">
+      <a disabled=\\"disabled\\" class=\\"back\\"><i class=\\"material-icons\\">arrow_back</i></a><a><i class=\\"material-icons\\">refresh</i></a><a><i class=\\"search material-icons\\">search</i></a><a class=\\"help\\"><i class=\\"material-icons\\">help_outline</i></a><a href=\\"#/preferences\\" class=\\"\\" id=\\"settings\\"><i class=\\"material-icons\\">settings</i></a><a id=\\"signOut-btn\\"><i class=\\"material-icons\\">exit_to_app</i></a>
+   </div>
 </div>
 </div>
    <menu class=\\"tm-page-header-menu\\">
-      <div>
-         <div>
-            <div class=\\"tm-tool-bar\\">
-               <div class=\\"tm-tool-bar-container\\">
-                  <div class=\\"main\\">
-                     <a disabled=\\"disabled\\" class=\\"back\\"><i class=\\"material-icons\\">arrow_back</i></a><a><i class=\\"material-icons\\">refresh</i></a><a><i class=\\"search material-icons\\">search</i></a><a class=\\"help\\"><i class=\\"material-icons\\">help_outline</i></a><a href=\\"#/preferences\\" class=\\"settings\\"><i id=\\"settings\\" class=\\"material-icons\\">settings</i></a><a id=\\"signOut-btn\\"><i class=\\"material-icons\\">exit_to_app</i></a>
-                  </div>
-</div>
-</div>
-</div>
-</div>
+      <div></div>
 </menu>
 </div>
 </header>
@@ -109,20 +102,13 @@ exports[`PageStaking has the expected html structure 1`] = `
 </div>
       <div class=\\"tabs\\"></div>
 </div>
+      <div class=\\"tm-tool-bar\\">
+         <a disabled=\\"disabled\\" class=\\"back\\"><i class=\\"material-icons\\">arrow_back</i></a><a><i class=\\"material-icons\\">refresh</i></a><a disabled=\\"disabled\\"><i class=\\"material-icons\\">search</i></a><a class=\\"help\\"><i class=\\"material-icons\\">help_outline</i></a><a href=\\"#/preferences\\" class=\\"\\" id=\\"settings\\"><i class=\\"material-icons\\">settings</i></a><a id=\\"signOut-btn\\"><i class=\\"material-icons\\">exit_to_app</i></a>
+      </div>
 </div>
 </div>
       <menu class=\\"tm-page-header-menu\\">
-         <div>
-            <div>
-               <div class=\\"tm-tool-bar\\">
-                  <div class=\\"tm-tool-bar-container\\">
-                     <div class=\\"main\\">
-                        <a disabled=\\"disabled\\" class=\\"back\\"><i class=\\"material-icons\\">arrow_back</i></a><a><i class=\\"material-icons\\">refresh</i></a><a disabled=\\"disabled\\"><i class=\\"material-icons\\">search</i></a><a class=\\"help\\"><i class=\\"material-icons\\">help_outline</i></a><a href=\\"#/preferences\\" class=\\"settings\\"><i id=\\"settings\\" class=\\"material-icons\\">settings</i></a><a id=\\"signOut-btn\\"><i class=\\"material-icons\\">exit_to_app</i></a>
-                     </div>
-</div>
-</div>
-</div>
-</div>
+         <div></div>
 </menu>
 </div>
 </header>
diff --git a/test/unit/specs/components/wallet/__snapshots__/PageSend.spec.js.snap b/test/unit/specs/components/wallet/__snapshots__/PageSend.spec.js.snap
index bfcb818b26..48914d9b30 100644
--- a/test/unit/specs/components/wallet/__snapshots__/PageSend.spec.js.snap
+++ b/test/unit/specs/components/wallet/__snapshots__/PageSend.spec.js.snap
@@ -26,53 +26,45 @@ exports[`PageSend disables sending if not connected 1`] = `
             <div
               class="tm-tool-bar"
             >
-              <div
-                class="tm-tool-bar-container"
+              <a
+                class="back"
+                disabled="disabled"
               >
-                <div
-                  class="main"
+                <i
+                  class="material-icons"
+                >
+                  arrow_back
+                </i>
+              </a>
+              <a
+                class="help"
+              >
+                <i
+                  class="material-icons"
+                >
+                  help_outline
+                </i>
+              </a>
+              <a
+                class=""
+                href="#/preferences"
+                id="settings"
+              >
+                <i
+                  class="material-icons"
+                >
+                  settings
+                </i>
+              </a>
+              <a
+                id="signOut-btn"
+              >
+                <i
+                  class="material-icons"
                 >
-                  <a
-                    class="back"
-                    disabled="disabled"
-                  >
-                    <i
-                      class="material-icons"
-                    >
-                      arrow_back
-                    </i>
-                  </a>
-                  <a
-                    class="help"
-                  >
-                    <i
-                      class="material-icons"
-                    >
-                      help_outline
-                    </i>
-                  </a>
-                  <a
-                    class="settings"
-                    href="#/preferences"
-                  >
-                    <i
-                      class="material-icons"
-                      id="settings"
-                    >
-                      settings
-                    </i>
-                  </a>
-                  <a
-                    id="signOut-btn"
-                  >
-                    <i
-                      class="material-icons"
-                    >
-                      exit_to_app
-                    </i>
-                  </a>
-                </div>
-              </div>
+                  exit_to_app
+                </i>
+              </a>
             </div>
           </div>
         </div>
@@ -365,53 +357,45 @@ exports[`PageSend has the expected html structure 1`] = `
             <div
               class="tm-tool-bar"
             >
-              <div
-                class="tm-tool-bar-container"
+              <a
+                class="back"
+                disabled="disabled"
               >
-                <div
-                  class="main"
+                <i
+                  class="material-icons"
+                >
+                  arrow_back
+                </i>
+              </a>
+              <a
+                class="help"
+              >
+                <i
+                  class="material-icons"
+                >
+                  help_outline
+                </i>
+              </a>
+              <a
+                class=""
+                href="#/preferences"
+                id="settings"
+              >
+                <i
+                  class="material-icons"
+                >
+                  settings
+                </i>
+              </a>
+              <a
+                id="signOut-btn"
+              >
+                <i
+                  class="material-icons"
                 >
-                  <a
-                    class="back"
-                    disabled="disabled"
-                  >
-                    <i
-                      class="material-icons"
-                    >
-                      arrow_back
-                    </i>
-                  </a>
-                  <a
-                    class="help"
-                  >
-                    <i
-                      class="material-icons"
-                    >
-                      help_outline
-                    </i>
-                  </a>
-                  <a
-                    class="settings"
-                    href="#/preferences"
-                  >
-                    <i
-                      class="material-icons"
-                      id="settings"
-                    >
-                      settings
-                    </i>
-                  </a>
-                  <a
-                    id="signOut-btn"
-                  >
-                    <i
-                      class="material-icons"
-                    >
-                      exit_to_app
-                    </i>
-                  </a>
-                </div>
-              </div>
+                  exit_to_app
+                </i>
+              </a>
             </div>
           </div>
         </div>
@@ -732,53 +716,45 @@ exports[`PageSend should show address required error 1`] = `
             <div
               class="tm-tool-bar"
             >
-              <div
-                class="tm-tool-bar-container"
+              <a
+                class="back"
+                disabled="disabled"
               >
-                <div
-                  class="main"
+                <i
+                  class="material-icons"
+                >
+                  arrow_back
+                </i>
+              </a>
+              <a
+                class="help"
+              >
+                <i
+                  class="material-icons"
+                >
+                  help_outline
+                </i>
+              </a>
+              <a
+                class=""
+                href="#/preferences"
+                id="settings"
+              >
+                <i
+                  class="material-icons"
+                >
+                  settings
+                </i>
+              </a>
+              <a
+                id="signOut-btn"
+              >
+                <i
+                  class="material-icons"
                 >
-                  <a
-                    class="back"
-                    disabled="disabled"
-                  >
-                    <i
-                      class="material-icons"
-                    >
-                      arrow_back
-                    </i>
-                  </a>
-                  <a
-                    class="help"
-                  >
-                    <i
-                      class="material-icons"
-                    >
-                      help_outline
-                    </i>
-                  </a>
-                  <a
-                    class="settings"
-                    href="#/preferences"
-                  >
-                    <i
-                      class="material-icons"
-                      id="settings"
-                    >
-                      settings
-                    </i>
-                  </a>
-                  <a
-                    id="signOut-btn"
-                  >
-                    <i
-                      class="material-icons"
-                    >
-                      exit_to_app
-                    </i>
-                  </a>
-                </div>
-              </div>
+                  exit_to_app
+                </i>
+              </a>
             </div>
           </div>
         </div>
@@ -1069,53 +1045,45 @@ exports[`PageSend should show bech32 error when address length is too long 1`] =
             <div
               class="tm-tool-bar"
             >
-              <div
-                class="tm-tool-bar-container"
+              <a
+                class="back"
+                disabled="disabled"
               >
-                <div
-                  class="main"
+                <i
+                  class="material-icons"
+                >
+                  arrow_back
+                </i>
+              </a>
+              <a
+                class="help"
+              >
+                <i
+                  class="material-icons"
+                >
+                  help_outline
+                </i>
+              </a>
+              <a
+                class=""
+                href="#/preferences"
+                id="settings"
+              >
+                <i
+                  class="material-icons"
+                >
+                  settings
+                </i>
+              </a>
+              <a
+                id="signOut-btn"
+              >
+                <i
+                  class="material-icons"
                 >
-                  <a
-                    class="back"
-                    disabled="disabled"
-                  >
-                    <i
-                      class="material-icons"
-                    >
-                      arrow_back
-                    </i>
-                  </a>
-                  <a
-                    class="help"
-                  >
-                    <i
-                      class="material-icons"
-                    >
-                      help_outline
-                    </i>
-                  </a>
-                  <a
-                    class="settings"
-                    href="#/preferences"
-                  >
-                    <i
-                      class="material-icons"
-                      id="settings"
-                    >
-                      settings
-                    </i>
-                  </a>
-                  <a
-                    id="signOut-btn"
-                  >
-                    <i
-                      class="material-icons"
-                    >
-                      exit_to_app
-                    </i>
-                  </a>
-                </div>
-              </div>
+                  exit_to_app
+                </i>
+              </a>
             </div>
           </div>
         </div>
@@ -1406,53 +1374,45 @@ exports[`PageSend should show bech32 error when address length is too short 1`]
             <div
               class="tm-tool-bar"
             >
-              <div
-                class="tm-tool-bar-container"
+              <a
+                class="back"
+                disabled="disabled"
               >
-                <div
-                  class="main"
+                <i
+                  class="material-icons"
+                >
+                  arrow_back
+                </i>
+              </a>
+              <a
+                class="help"
+              >
+                <i
+                  class="material-icons"
+                >
+                  help_outline
+                </i>
+              </a>
+              <a
+                class=""
+                href="#/preferences"
+                id="settings"
+              >
+                <i
+                  class="material-icons"
+                >
+                  settings
+                </i>
+              </a>
+              <a
+                id="signOut-btn"
+              >
+                <i
+                  class="material-icons"
                 >
-                  <a
-                    class="back"
-                    disabled="disabled"
-                  >
-                    <i
-                      class="material-icons"
-                    >
-                      arrow_back
-                    </i>
-                  </a>
-                  <a
-                    class="help"
-                  >
-                    <i
-                      class="material-icons"
-                    >
-                      help_outline
-                    </i>
-                  </a>
-                  <a
-                    class="settings"
-                    href="#/preferences"
-                  >
-                    <i
-                      class="material-icons"
-                      id="settings"
-                    >
-                      settings
-                    </i>
-                  </a>
-                  <a
-                    id="signOut-btn"
-                  >
-                    <i
-                      class="material-icons"
-                    >
-                      exit_to_app
-                    </i>
-                  </a>
-                </div>
-              </div>
+                  exit_to_app
+                </i>
+              </a>
             </div>
           </div>
         </div>
@@ -1743,53 +1703,45 @@ exports[`PageSend should show bech32 error when alphanumeric is wrong 1`] = `
             <div
               class="tm-tool-bar"
             >
-              <div
-                class="tm-tool-bar-container"
+              <a
+                class="back"
+                disabled="disabled"
               >
-                <div
-                  class="main"
+                <i
+                  class="material-icons"
+                >
+                  arrow_back
+                </i>
+              </a>
+              <a
+                class="help"
+              >
+                <i
+                  class="material-icons"
+                >
+                  help_outline
+                </i>
+              </a>
+              <a
+                class=""
+                href="#/preferences"
+                id="settings"
+              >
+                <i
+                  class="material-icons"
+                >
+                  settings
+                </i>
+              </a>
+              <a
+                id="signOut-btn"
+              >
+                <i
+                  class="material-icons"
                 >
-                  <a
-                    class="back"
-                    disabled="disabled"
-                  >
-                    <i
-                      class="material-icons"
-                    >
-                      arrow_back
-                    </i>
-                  </a>
-                  <a
-                    class="help"
-                  >
-                    <i
-                      class="material-icons"
-                    >
-                      help_outline
-                    </i>
-                  </a>
-                  <a
-                    class="settings"
-                    href="#/preferences"
-                  >
-                    <i
-                      class="material-icons"
-                      id="settings"
-                    >
-                      settings
-                    </i>
-                  </a>
-                  <a
-                    id="signOut-btn"
-                  >
-                    <i
-                      class="material-icons"
-                    >
-                      exit_to_app
-                    </i>
-                  </a>
-                </div>
-              </div>
+                  exit_to_app
+                </i>
+              </a>
             </div>
           </div>
         </div>
@@ -2091,53 +2043,45 @@ exports[`PageSend should trigger confirmation modal if form is corect 1`] = `
             <div
               class="tm-tool-bar"
             >
-              <div
-                class="tm-tool-bar-container"
+              <a
+                class="back"
+                disabled="disabled"
               >
-                <div
-                  class="main"
+                <i
+                  class="material-icons"
+                >
+                  arrow_back
+                </i>
+              </a>
+              <a
+                class="help"
+              >
+                <i
+                  class="material-icons"
+                >
+                  help_outline
+                </i>
+              </a>
+              <a
+                class=""
+                href="#/preferences"
+                id="settings"
+              >
+                <i
+                  class="material-icons"
+                >
+                  settings
+                </i>
+              </a>
+              <a
+                id="signOut-btn"
+              >
+                <i
+                  class="material-icons"
                 >
-                  <a
-                    class="back"
-                    disabled="disabled"
-                  >
-                    <i
-                      class="material-icons"
-                    >
-                      arrow_back
-                    </i>
-                  </a>
-                  <a
-                    class="help"
-                  >
-                    <i
-                      class="material-icons"
-                    >
-                      help_outline
-                    </i>
-                  </a>
-                  <a
-                    class="settings"
-                    href="#/preferences"
-                  >
-                    <i
-                      class="material-icons"
-                      id="settings"
-                    >
-                      settings
-                    </i>
-                  </a>
-                  <a
-                    id="signOut-btn"
-                  >
-                    <i
-                      class="material-icons"
-                    >
-                      exit_to_app
-                    </i>
-                  </a>
-                </div>
-              </div>
+                  exit_to_app
+                </i>
+              </a>
             </div>
           </div>
         </div>
@@ -2518,53 +2462,45 @@ exports[`PageSend should work without providing a default denom 1`] = `
             <div
               class="tm-tool-bar"
             >
-              <div
-                class="tm-tool-bar-container"
+              <a
+                class="back"
+                disabled="disabled"
               >
-                <div
-                  class="main"
+                <i
+                  class="material-icons"
+                >
+                  arrow_back
+                </i>
+              </a>
+              <a
+                class="help"
+              >
+                <i
+                  class="material-icons"
+                >
+                  help_outline
+                </i>
+              </a>
+              <a
+                class=""
+                href="#/preferences"
+                id="settings"
+              >
+                <i
+                  class="material-icons"
+                >
+                  settings
+                </i>
+              </a>
+              <a
+                id="signOut-btn"
+              >
+                <i
+                  class="material-icons"
                 >
-                  <a
-                    class="back"
-                    disabled="disabled"
-                  >
-                    <i
-                      class="material-icons"
-                    >
-                      arrow_back
-                    </i>
-                  </a>
-                  <a
-                    class="help"
-                  >
-                    <i
-                      class="material-icons"
-                    >
-                      help_outline
-                    </i>
-                  </a>
-                  <a
-                    class="settings"
-                    href="#/preferences"
-                  >
-                    <i
-                      class="material-icons"
-                      id="settings"
-                    >
-                      settings
-                    </i>
-                  </a>
-                  <a
-                    id="signOut-btn"
-                  >
-                    <i
-                      class="material-icons"
-                    >
-                      exit_to_app
-                    </i>
-                  </a>
-                </div>
-              </div>
+                  exit_to_app
+                </i>
+              </a>
             </div>
           </div>
         </div>
diff --git a/test/unit/specs/components/wallet/__snapshots__/PageTransactions.spec.js.snap b/test/unit/specs/components/wallet/__snapshots__/PageTransactions.spec.js.snap
index c8d3e357a2..7b90448f49 100644
--- a/test/unit/specs/components/wallet/__snapshots__/PageTransactions.spec.js.snap
+++ b/test/unit/specs/components/wallet/__snapshots__/PageTransactions.spec.js.snap
@@ -82,80 +82,69 @@ exports[`PageTransactions has the expected html structure 1`] = `
               class="tabs"
             />
           </div>
+          <div
+            class="tm-tool-bar"
+          >
+            <a
+              class="back"
+              disabled="disabled"
+            >
+              <i
+                class="material-icons"
+              >
+                arrow_back
+              </i>
+            </a>
+            <a>
+              <i
+                class="material-icons"
+              >
+                refresh
+              </i>
+            </a>
+            <a>
+              <i
+                class="material-icons"
+              >
+                search
+              </i>
+            </a>
+            <a
+              class="help"
+            >
+              <i
+                class="material-icons"
+              >
+                help_outline
+              </i>
+            </a>
+            <a
+              class=""
+              href="#/preferences"
+              id="settings"
+            >
+              <i
+                class="material-icons"
+              >
+                settings
+              </i>
+            </a>
+            <a
+              id="signOut-btn"
+            >
+              <i
+                class="material-icons"
+              >
+                exit_to_app
+              </i>
+            </a>
+          </div>
         </div>
       </div>
       <menu
         class="tm-page-header-menu"
       >
-        <div>
-          <div>
-            <div
-              class="tm-tool-bar"
-            >
-              <div
-                class="tm-tool-bar-container"
-              >
-                <div
-                  class="main"
-                >
-                  <a
-                    class="back"
-                    disabled="disabled"
-                  >
-                    <i
-                      class="material-icons"
-                    >
-                      arrow_back
-                    </i>
-                  </a>
-                  <a>
-                    <i
-                      class="material-icons"
-                    >
-                      refresh
-                    </i>
-                  </a>
-                  <a>
-                    <i
-                      class="material-icons"
-                    >
-                      search
-                    </i>
-                  </a>
-                  <a
-                    class="help"
-                  >
-                    <i
-                      class="material-icons"
-                    >
-                      help_outline
-                    </i>
-                  </a>
-                  <a
-                    class="settings"
-                    href="#/preferences"
-                  >
-                    <i
-                      class="material-icons"
-                      id="settings"
-                    >
-                      settings
-                    </i>
-                  </a>
-                  <a
-                    id="signOut-btn"
-                  >
-                    <i
-                      class="material-icons"
-                    >
-                      exit_to_app
-                    </i>
-                  </a>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
+        <div />
       </menu>
     </div>
   </header>
@@ -309,80 +298,69 @@ exports[`PageTransactions should filter the transactions 1`] = `
               class="tabs"
             />
           </div>
+          <div
+            class="tm-tool-bar"
+          >
+            <a
+              class="back"
+              disabled="disabled"
+            >
+              <i
+                class="material-icons"
+              >
+                arrow_back
+              </i>
+            </a>
+            <a>
+              <i
+                class="material-icons"
+              >
+                refresh
+              </i>
+            </a>
+            <a>
+              <i
+                class="material-icons"
+              >
+                search
+              </i>
+            </a>
+            <a
+              class="help"
+            >
+              <i
+                class="material-icons"
+              >
+                help_outline
+              </i>
+            </a>
+            <a
+              class=""
+              href="#/preferences"
+              id="settings"
+            >
+              <i
+                class="material-icons"
+              >
+                settings
+              </i>
+            </a>
+            <a
+              id="signOut-btn"
+            >
+              <i
+                class="material-icons"
+              >
+                exit_to_app
+              </i>
+            </a>
+          </div>
         </div>
       </div>
       <menu
         class="tm-page-header-menu"
       >
-        <div>
-          <div>
-            <div
-              class="tm-tool-bar"
-            >
-              <div
-                class="tm-tool-bar-container"
-              >
-                <div
-                  class="main"
-                >
-                  <a
-                    class="back"
-                    disabled="disabled"
-                  >
-                    <i
-                      class="material-icons"
-                    >
-                      arrow_back
-                    </i>
-                  </a>
-                  <a>
-                    <i
-                      class="material-icons"
-                    >
-                      refresh
-                    </i>
-                  </a>
-                  <a>
-                    <i
-                      class="material-icons"
-                    >
-                      search
-                    </i>
-                  </a>
-                  <a
-                    class="help"
-                  >
-                    <i
-                      class="material-icons"
-                    >
-                      help_outline
-                    </i>
-                  </a>
-                  <a
-                    class="settings"
-                    href="#/preferences"
-                  >
-                    <i
-                      class="material-icons"
-                      id="settings"
-                    >
-                      settings
-                    </i>
-                  </a>
-                  <a
-                    id="signOut-btn"
-                  >
-                    <i
-                      class="material-icons"
-                    >
-                      exit_to_app
-                    </i>
-                  </a>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
+        <div />
       </menu>
     </div>
   </header>
diff --git a/test/unit/specs/components/wallet/__snapshots__/PageWallet.spec.js.snap b/test/unit/specs/components/wallet/__snapshots__/PageWallet.spec.js.snap
index f0b8fbf2ab..a7badd4b00 100644
--- a/test/unit/specs/components/wallet/__snapshots__/PageWallet.spec.js.snap
+++ b/test/unit/specs/components/wallet/__snapshots__/PageWallet.spec.js.snap
@@ -82,80 +82,69 @@ exports[`PageWallet has the expected html structure 1`] = `
               class="tabs"
             />
           </div>
+          <div
+            class="tm-tool-bar"
+          >
+            <a
+              class="back"
+              disabled="disabled"
+            >
+              <i
+                class="material-icons"
+              >
+                arrow_back
+              </i>
+            </a>
+            <a>
+              <i
+                class="material-icons"
+              >
+                refresh
+              </i>
+            </a>
+            <a>
+              <i
+                class="material-icons"
+              >
+                search
+              </i>
+            </a>
+            <a
+              class="help"
+            >
+              <i
+                class="material-icons"
+              >
+                help_outline
+              </i>
+            </a>
+            <a
+              class=""
+              href="#/preferences"
+              id="settings"
+            >
+              <i
+                class="material-icons"
+              >
+                settings
+              </i>
+            </a>
+            <a
+              id="signOut-btn"
+            >
+              <i
+                class="material-icons"
+              >
+                exit_to_app
+              </i>
+            </a>
+          </div>
         </div>
       </div>
       <menu
         class="tm-page-header-menu"
       >
-        <div>
-          <div>
-            <div
-              class="tm-tool-bar"
-            >
-              <div
-                class="tm-tool-bar-container"
-              >
-                <div
-                  class="main"
-                >
-                  <a
-                    class="back"
-                    disabled="disabled"
-                  >
-                    <i
-                      class="material-icons"
-                    >
-                      arrow_back
-                    </i>
-                  </a>
-                  <a>
-                    <i
-                      class="material-icons"
-                    >
-                      refresh
-                    </i>
-                  </a>
-                  <a>
-                    <i
-                      class="material-icons"
-                    >
-                      search
-                    </i>
-                  </a>
-                  <a
-                    class="help"
-                  >
-                    <i
-                      class="material-icons"
-                    >
-                      help_outline
-                    </i>
-                  </a>
-                  <a
-                    class="settings"
-                    href="#/preferences"
-                  >
-                    <i
-                      class="material-icons"
-                      id="settings"
-                    >
-                      settings
-                    </i>
-                  </a>
-                  <a
-                    id="signOut-btn"
-                  >
-                    <i
-                      class="material-icons"
-                    >
-                      exit_to_app
-                    </i>
-                  </a>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
+        <div />
       </menu>
     </div>
   </header>
@@ -520,80 +509,69 @@ exports[`PageWallet should filter the balances 1`] = `
               class="tabs"
             />
           </div>
+          <div
+            class="tm-tool-bar"
+          >
+            <a
+              class="back"
+              disabled="disabled"
+            >
+              <i
+                class="material-icons"
+              >
+                arrow_back
+              </i>
+            </a>
+            <a>
+              <i
+                class="material-icons"
+              >
+                refresh
+              </i>
+            </a>
+            <a>
+              <i
+                class="material-icons"
+              >
+                search
+              </i>
+            </a>
+            <a
+              class="help"
+            >
+              <i
+                class="material-icons"
+              >
+                help_outline
+              </i>
+            </a>
+            <a
+              class=""
+              href="#/preferences"
+              id="settings"
+            >
+              <i
+                class="material-icons"
+              >
+                settings
+              </i>
+            </a>
+            <a
+              id="signOut-btn"
+            >
+              <i
+                class="material-icons"
+              >
+                exit_to_app
+              </i>
+            </a>
+          </div>
         </div>
       </div>
       <menu
         class="tm-page-header-menu"
       >
-        <div>
-          <div>
-            <div
-              class="tm-tool-bar"
-            >
-              <div
-                class="tm-tool-bar-container"
-              >
-                <div
-                  class="main"
-                >
-                  <a
-                    class="back"
-                    disabled="disabled"
-                  >
-                    <i
-                      class="material-icons"
-                    >
-                      arrow_back
-                    </i>
-                  </a>
-                  <a>
-                    <i
-                      class="material-icons"
-                    >
-                      refresh
-                    </i>
-                  </a>
-                  <a>
-                    <i
-                      class="material-icons"
-                    >
-                      search
-                    </i>
-                  </a>
-                  <a
-                    class="help"
-                  >
-                    <i
-                      class="material-icons"
-                    >
-                      help_outline
-                    </i>
-                  </a>
-                  <a
-                    class="settings"
-                    href="#/preferences"
-                  >
-                    <i
-                      class="material-icons"
-                      id="settings"
-                    >
-                      settings
-                    </i>
-                  </a>
-                  <a
-                    id="signOut-btn"
-                  >
-                    <i
-                      class="material-icons"
-                    >
-                      exit_to_app
-                    </i>
-                  </a>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
+        <div />
       </menu>
     </div>
   </header>
diff --git a/test/unit/specs/store/governance/deposits.spec.js b/test/unit/specs/store/governance/deposits.spec.js
index 4bc8af1c42..3ef50dba99 100644
--- a/test/unit/specs/store/governance/deposits.spec.js
+++ b/test/unit/specs/store/governance/deposits.spec.js
@@ -26,12 +26,12 @@ describe(`Module: Deposits`, () => {
     let { actions, state } = module
     let commit = jest.fn()
     proposals.forEach(async (proposal, i) => {
-      let proposalID = proposal.proposal_id
-      await actions.getProposalDeposits({ state, commit }, proposalID)
+      let proposalId = proposal.proposal_id
+      await actions.getProposalDeposits({ state, commit }, proposalId)
       expect(commit.mock.calls[i]).toEqual([
         `setProposalDeposits`,
-        proposalID,
-        deposits[proposalID]
+        proposalId,
+        deposits[proposalId]
       ])
     })
   })
@@ -41,36 +41,33 @@ describe(`Module: Deposits`, () => {
     jest.useFakeTimers()
 
     const rootState = {
-      config: {
-        bondingDenom: `stake`
-      },
       wallet: {
         address: addresses[0]
       }
     }
 
     let dispatch = jest.fn()
-    const amount = 15
+    const amount = [
+      {
+        denom: `stake`,
+        amount: `15`
+      }
+    ]
 
     proposals.forEach(async (proposal, i) => {
       await actions.submitDeposit(
         { rootState, dispatch },
-        proposal.proposal_id,
-        amount
+        { proposal_id: proposal.proposal_id, amount }
       )
 
       expect(dispatch.mock.calls[i]).toEqual([
         `sendTx`,
         {
           type: `submitProposalDeposit`,
+          to: proposal.proposal_id,
           proposal_id: proposal.proposal_id,
           depositer: addresses[0],
-          amount: [
-            {
-              denom: rootState.config.bondingDenom,
-              amount
-            }
-          ]
+          amount
         }
       ])
 
diff --git a/test/unit/specs/store/governance/proposals.spec.js b/test/unit/specs/store/governance/proposals.spec.js
index a35d02067d..b4180b2937 100644
--- a/test/unit/specs/store/governance/proposals.spec.js
+++ b/test/unit/specs/store/governance/proposals.spec.js
@@ -85,13 +85,21 @@ describe(`Module: Proposals`, () => {
     }
     let dispatch = jest.fn()
     proposals.forEach(async (proposal, i) => {
-      await actions.submitProposal({ rootState, dispatch }, proposal)
+      await actions.submitProposal(
+        { rootState, dispatch },
+        {
+          type: proposal.proposal_type,
+          title: proposal.title,
+          description: proposal.description,
+          initial_deposit: proposal.initial_deposit
+        }
+      )
       expect(dispatch.mock.calls[i]).toEqual([
         `sendTx`,
         {
           type: `submitProposal`,
-          proposer: addresses[0],
           proposal_type: proposal.proposal_type,
+          proposer: addresses[0],
           title: proposal.title,
           description: proposal.description,
           initial_deposit: proposal.initial_deposit
diff --git a/test/unit/specs/store/governance/votes.spec.js b/test/unit/specs/store/governance/votes.spec.js
index c63bcd95aa..b1fa4e3a09 100644
--- a/test/unit/specs/store/governance/votes.spec.js
+++ b/test/unit/specs/store/governance/votes.spec.js
@@ -51,16 +51,16 @@ describe(`Module: Votes`, () => {
     proposals.forEach(async (proposal, i) => {
       await actions.submitVote(
         { rootState, dispatch },
-        proposal.proposal_id,
-        `yes`
+        { proposal_id: proposal.proposal_id, option: `Yes` }
       )
       expect(dispatch.mock.calls[i]).toEqual([
         `sendTx`,
         {
           type: `submitProposalVote`,
+          to: proposal.proposal_id,
           proposal_id: proposal.proposal_id,
           voter: addresses[0],
-          option: `yes`
+          option: `Yes`
         }
       ])