diff --git a/CHANGELOG.md b/CHANGELOG.md
index bca1e98b79..39d22ee2f6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-## [3.0.0] - 2018-01-15
+## [0.3.0] - 2018-01-15
 ### Added
 - Added a changelog @jolesbi.
+
+## [0.3.1] - 2018-01-30
+### Changed
+* Improved performance of amountBonded in LiDelegate.vue @nylira.
+* Prevented user from going to PageBond if they don't have any atoms/fermions @nylira.
+* Hid the bonding interface on PageDelegates if the user doesn't have any atoms @nylira.
diff --git a/app/src/renderer/components/common/NiSessionLoading.vue b/app/src/renderer/components/common/NiSessionLoading.vue
index fdb0382766..2c628c2333 100644
--- a/app/src/renderer/components/common/NiSessionLoading.vue
+++ b/app/src/renderer/components/common/NiSessionLoading.vue
@@ -4,7 +4,6 @@
     .ni-session-title Loading…
   .ni-session-main &nbsp
   .ni-session-footer  
-  notifications(:notifications='notifications' theme='cosmos')
 </template>
 
 <script>
diff --git a/app/src/renderer/components/common/NiSessionSignIn.vue b/app/src/renderer/components/common/NiSessionSignIn.vue
index 85d112320f..1c9361b5eb 100644
--- a/app/src/renderer/components/common/NiSessionSignIn.vue
+++ b/app/src/renderer/components/common/NiSessionSignIn.vue
@@ -9,6 +9,7 @@
       field#sign-in-name(
         type="select"
         v-model="fields.signInName"
+        placeholder="Select account…"
         :options="accounts")
       form-msg(name='Name' type='required' v-if='!$v.fields.signInName.required')
 
@@ -73,10 +74,11 @@ export default {
     },
     setDefaultAccount () {
       let prevAccountKey = localStorage.getItem('prevAccountKey')
+      let prevAccountExists = this.accounts.find(a => a.key === prevAccountKey)
 
       if (this.accounts.length === 1) {
         this.fields.signInName = this.accounts[0].key
-      } else if (prevAccountKey) {
+      } else if (prevAccountExists) {
         this.fields.signInName = prevAccountKey
       }
 
diff --git a/app/src/renderer/components/staking/LiDelegate.vue b/app/src/renderer/components/staking/LiDelegate.vue
index e1c487d0a2..46ced89131 100644
--- a/app/src/renderer/components/staking/LiDelegate.vue
+++ b/app/src/renderer/components/staking/LiDelegate.vue
@@ -10,11 +10,14 @@
     span {{ num.prettyInt(delegate.voting_power) }}
     .bar(:style='vpStyles')
   .li-delegate__value.bonded_by_you
-    span {{ num.prettyInt(amountBonded(delegate.id)) }}
-  .li-delegate__value.checkbox#remove-from-cart(v-if="inCart" @click='rm(delegate)')
-    i.material-icons check_box
-  .li-delegate__value.checkbox#add-to-cart(v-else @click='add(delegate)')
-    i.material-icons check_box_outline_blank
+    span {{ amountBonded }}
+  template(v-if="userCanDelegate")
+    .li-delegate__value.checkbox#remove-from-cart(v-if="inCart" @click='rm(delegate)')
+      i.material-icons check_box
+    .li-delegate__value.checkbox#add-to-cart(v-else @click='add(delegate)')
+      i.material-icons check_box_outline_blank
+  template(v-else)
+    .li-delegate__value
 </template>
 
 <script>
@@ -29,7 +32,10 @@ export default {
     Btn
   },
   computed: {
-    ...mapGetters(['shoppingCart', 'delegates', 'config', 'committedDelegations']),
+    ...mapGetters(['shoppingCart', 'delegates', 'config', 'committedDelegations', 'user']),
+    amountBonded () {
+      return this.num.prettyInt(this.committedDelegations[this.delegate.id])
+    },
     styles () {
       let value = ''
       if (this.inCart) value += 'li-delegate-active '
@@ -57,17 +63,15 @@ export default {
     },
     inCart () {
       return this.shoppingCart.find(c => c.id === this.delegate.id)
-    }
+    },
+    userCanDelegate () { return this.user.atoms > 0 }
   },
   data: () => ({
     num: num
   }),
   methods: {
     add (delegate) { this.$store.commit('addToCart', delegate) },
-    rm (delegate) { this.$store.commit('removeFromCart', delegate.id) },
-    amountBonded (delegateId) {
-      return this.committedDelegations[delegateId]
-    }
+    rm (delegate) { this.$store.commit('removeFromCart', delegate.id) }
   }
 }
 </script>
diff --git a/app/src/renderer/components/staking/PageBond.vue b/app/src/renderer/components/staking/PageBond.vue
index ab261d101c..220f2136a3 100644
--- a/app/src/renderer/components/staking/PageBond.vue
+++ b/app/src/renderer/components/staking/PageBond.vue
@@ -234,6 +234,15 @@ export default {
         return d
       })
     },
+    leaveIfBroke (count) {
+      if (count === 0) {
+        this.$store.commit('notifyError', {
+          title: 'Cannot Bond Without Atoms',
+          body: 'You do not have any atoms to bond to delegates.'
+        })
+        this.$router.push('/staking')
+      }
+    },
     leaveIfEmpty (count) {
       if (count === 0) {
         this.$store.commit('notifyError', {
@@ -323,6 +332,7 @@ export default {
     }
   },
   async mounted () {
+    this.leaveIfBroke(this.user.atoms)
     this.leaveIfEmpty(this.shoppingCart.length)
     this.resetFields()
     this.bondBarsInput()
diff --git a/app/src/renderer/components/staking/PageDelegates.vue b/app/src/renderer/components/staking/PageDelegates.vue
index 2d7c2e040f..e217e57723 100644
--- a/app/src/renderer/components/staking/PageDelegates.vue
+++ b/app/src/renderer/components/staking/PageDelegates.vue
@@ -18,8 +18,12 @@ page#page-delegates(title='Delegates')
       li-delegate(v-for='i in filteredDelegates' :key='i.id' :delegate='i')
 
   .fixed-button-bar
-    .label #[strong {{ shoppingCart.length }}] delegates selected
-    btn.btn__primary(type="link" to="/staking/bond" :disabled="shoppingCart.length < 1" icon="chevron_right" icon-pos="right" value="Next")
+    template(v-if="userCanDelegate")
+      .label #[strong {{ shoppingCart.length }}] delegates selected
+      btn.btn__primary(type="link" to="/staking/bond" :disabled="shoppingCart.length < 1" icon="chevron_right" icon-pos="right" value="Next")
+    template(v-else)
+      .label You do not have any ATOMs to delegate.
+      btn.btn__primary(disabled icon="chevron_right" icon-pos="right" value="Next")
 </template>
 
 <script>
@@ -61,7 +65,8 @@ export default {
       } else {
         return list
       }
-    }
+    },
+    userCanDelegate () { return this.user.atoms > 0 }
   },
   data: () => ({
     query: '',
diff --git a/test/unit/specs/components/common/__snapshots__/NISessionLoading.spec.js.snap b/test/unit/specs/components/common/__snapshots__/NISessionLoading.spec.js.snap
index fe5ce29971..8cb1ee373f 100644
--- a/test/unit/specs/components/common/__snapshots__/NISessionLoading.spec.js.snap
+++ b/test/unit/specs/components/common/__snapshots__/NISessionLoading.spec.js.snap
@@ -14,7 +14,6 @@ exports[`NiSessionLoading has the expected html structure 1`] = `
 <div class=\\"ni-session-footer\\">
    &nbsp;
 </div>
-<notifications theme=\\"cosmos\\"></notifications>
 </div>
 </div>"
 `;
diff --git a/test/unit/specs/components/common/__snapshots__/NISessionSignIn.spec.js.snap b/test/unit/specs/components/common/__snapshots__/NISessionSignIn.spec.js.snap
index 602f012e53..67557733d5 100644
--- a/test/unit/specs/components/common/__snapshots__/NISessionSignIn.spec.js.snap
+++ b/test/unit/specs/components/common/__snapshots__/NISessionSignIn.spec.js.snap
@@ -21,7 +21,7 @@ exports[`NiSessionSignIn has the expected html structure 1`] = `
                <div class=\\"ni-select\\" id=\\"sign-in-name\\">
                   <select class=\\"ni-field ni-field-select\\">
                   <option value=\\"\\" disabled=\\"disabled\\" selected=\\"selected\\" hidden=\\"hidden\\">
-                     Select option...
+                     Select account…
                   </option>
                      <!---->
                      <!---->
diff --git a/test/unit/specs/components/staking/LiDelegate.spec.js b/test/unit/specs/components/staking/LiDelegate.spec.js
index f8a920b7b3..e895073323 100644
--- a/test/unit/specs/components/staking/LiDelegate.spec.js
+++ b/test/unit/specs/components/staking/LiDelegate.spec.js
@@ -17,6 +17,7 @@ describe('LiDelegate', () => {
     wrapper = test.wrapper
     store = test.store
 
+    store.commit('setAtoms', 1337)
     store.commit('addDelegate', {
       pub_key: {
         type: 'ed25519',
@@ -62,7 +63,8 @@ describe('LiDelegate', () => {
   })
 
   it('should show the relative voting power as a bar', () => {
-    expect(wrapper.vm.$el.querySelector('.number_of_votes .bar').style.width).toBe('33%')
+    expect(wrapper.vm.$el.querySelector('.number_of_votes .bar')
+      .style.width).toBe('33%')
   })
 
   it('should add to cart', () => {
diff --git a/test/unit/specs/components/staking/PageDelegates.spec.js b/test/unit/specs/components/staking/PageDelegates.spec.js
index ebc66a7b7b..6b62aec089 100644
--- a/test/unit/specs/components/staking/PageDelegates.spec.js
+++ b/test/unit/specs/components/staking/PageDelegates.spec.js
@@ -12,6 +12,7 @@ describe('PageDelegates', () => {
     store = instance.store
 
     store.state.user.address = 'abc'
+    store.commit('setAtoms', 1337)
     store.commit('addDelegate', {
       pub_key: {
         type: 'ed25519',