diff --git a/frontend/src/views/Pages/GddGdtStatus.spec.js b/frontend/src/components/Status.spec.js
similarity index 82%
rename from frontend/src/views/Pages/GddGdtStatus.spec.js
rename to frontend/src/components/Status.spec.js
index 8a16310c6..4e203c315 100644
--- a/frontend/src/views/Pages/GddGdtStatus.spec.js
+++ b/frontend/src/components/Status.spec.js
@@ -1,9 +1,9 @@
 import { mount } from '@vue/test-utils'
-import GddStatus from './GddGdtStatus'
+import Status from './Status'
 
 const localVue = global.localVue
 
-describe('GddStatus', () => {
+describe('Status', () => {
   let wrapper
 
   const mocks = {
@@ -16,7 +16,7 @@ describe('GddStatus', () => {
   }
 
   const Wrapper = () => {
-    return mount(GddStatus, { localVue, mocks, propsData })
+    return mount(Status, { localVue, mocks, propsData })
   }
 
   describe('mount', () => {
diff --git a/frontend/src/views/Pages/GddGdtStatus.vue b/frontend/src/components/Status.vue
similarity index 95%
rename from frontend/src/views/Pages/GddGdtStatus.vue
rename to frontend/src/components/Status.vue
index 20308690a..7900763f7 100644
--- a/frontend/src/views/Pages/GddGdtStatus.vue
+++ b/frontend/src/components/Status.vue
@@ -8,7 +8,7 @@
 
 <script>
 export default {
-  name: 'GddStatus',
+  name: 'Status',
   props: {
     balance: { type: Number, default: 0 },
     pending: {
diff --git a/frontend/src/views/Layout/DashboardLayout_gdd.spec.js b/frontend/src/views/Layout/DashboardLayout_gdd.spec.js
index 499e0ee9e..09185ee3f 100644
--- a/frontend/src/views/Layout/DashboardLayout_gdd.spec.js
+++ b/frontend/src/views/Layout/DashboardLayout_gdd.spec.js
@@ -108,7 +108,7 @@ describe('DashboardLayoutGdd', () => {
 
       it('has second item "send" linked to /send in navbar', () => {
         navbar.findAll('ul > a').at(1).trigger('click')
-        expect(wrapper.findAll('ul > a').at(1).attributes('href')).toBe('/send')
+        expect(wrapper.findAll('a').at(3).attributes('href')).toBe('/send')
       })
 
       it('has third item "transactions" in navbar', () => {
diff --git a/frontend/src/views/Pages/AccountOverview.vue b/frontend/src/views/Pages/AccountOverview.vue
index f6c869379..00d4249a2 100644
--- a/frontend/src/views/Pages/AccountOverview.vue
+++ b/frontend/src/views/Pages/AccountOverview.vue
@@ -5,7 +5,7 @@
         <b-col class="col-6">
           <b-row>
             <b-col class="col-11 bg-gray text-white p-3">
-              <gdd-status
+              <status
                 class="gdd-status-gdd"
                 :pending="pending"
                 :balance="balance"
@@ -17,7 +17,7 @@
         <b-col class="col-6 text-right">
           <b-row>
             <b-col class="bg-white text-gray p-3">
-              <gdd-status
+              <status
                 class="gdd-status-gdt"
                 :pending="pending"
                 :balance="GdtBalance"
@@ -40,14 +40,14 @@
   </div>
 </template>
 <script>
-import GddStatus from './GddGdtStatus.vue'
+import Status from '../../components/Status.vue'
 import GddTransactionList from './AccountOverview/GddTransactionList.vue'
 import GddTransactionListFooter from './AccountOverview/GddTransactionListFooter.vue'
 
 export default {
   name: 'Overview',
   components: {
-    GddStatus,
+    Status,
     GddTransactionList,
     GddTransactionListFooter,
   },
diff --git a/frontend/src/views/Pages/SendOverview.vue b/frontend/src/views/Pages/SendOverview.vue
index 165039765..595aac367 100644
--- a/frontend/src/views/Pages/SendOverview.vue
+++ b/frontend/src/views/Pages/SendOverview.vue
@@ -3,7 +3,7 @@
     <b-container fluid>
       <b-row>
         <b-col class="bg-gray text-white text-center p-3">
-          <gdd-status
+          <status
             class="gdd-status-gdd"
             v-if="showContext"
             :pending="pending"
@@ -41,7 +41,7 @@
   </div>
 </template>
 <script>
-import GddStatus from './GddGdtStatus.vue'
+import Status from '../../components/Status.vue'
 import GddSend from './SendOverview/GddSend.vue'
 
 import TransactionForm from './SendOverview/GddSend/TransactionForm.vue'
@@ -58,7 +58,7 @@ const EMPTY_TRANSACTION_DATA = {
 export default {
   name: 'SendOverview',
   components: {
-    GddStatus,
+    Status,
     GddSend,
 
     TransactionForm,