diff --git a/assets/src/components/Sidebar.vue b/assets/src/components/Sidebar.vue
index bb4f6898..2c7b0d1e 100644
--- a/assets/src/components/Sidebar.vue
+++ b/assets/src/components/Sidebar.vue
@@ -65,7 +65,6 @@ export default {
   computed: {
     ...mapState(['user', 'plugins']),
     active () {
-      console.log(this.$i18n)
       return this.$store.state.show === 'sidebar'
     }
   },
diff --git a/assets/src/components/buttons/Copy.vue b/assets/src/components/buttons/Copy.vue
index 9ee554a4..164cf347 100644
--- a/assets/src/components/buttons/Copy.vue
+++ b/assets/src/components/buttons/Copy.vue
@@ -1,7 +1,7 @@
 <template>
-  <button @click="show" aria-label="Copy" title="Copy" class="action" id="copy-button">
+  <button @click="show" :aria-label="$t('buttons.copy')" :title="$t('buttons.copy')" class="action" id="copy-button">
     <i class="material-icons">content_copy</i>
-    <span>Copy file</span>
+    <span>{{ $t('buttons.copyFile') }}</span>
   </button>
 </template>
 
diff --git a/assets/src/components/buttons/Delete.vue b/assets/src/components/buttons/Delete.vue
index 69c43c6e..bb3c0fdf 100644
--- a/assets/src/components/buttons/Delete.vue
+++ b/assets/src/components/buttons/Delete.vue
@@ -1,7 +1,7 @@
 <template>
-  <button @click="show" aria-label="Delete"  title="Delete" class="action" id="delete-button">
+  <button @click="show" :aria-label="$t('buttons.delete')" :title="$t('buttons.delete')" class="action" id="delete-button">
     <i class="material-icons">delete</i>
-    <span>Delete</span>
+    <span>{{ $t('buttons.delete') }}</span>
   </button>
 </template>
 
diff --git a/assets/src/components/buttons/Download.vue b/assets/src/components/buttons/Download.vue
index d2bf4a0c..788d746e 100644
--- a/assets/src/components/buttons/Download.vue
+++ b/assets/src/components/buttons/Download.vue
@@ -1,7 +1,7 @@
 <template>
-  <button @click="download" aria-label="Download" title="Download" id="download-button" class="action">
+  <button @click="download" :aria-label="$t('buttons.download')" :title="$t('buttons.download')" id="download-button" class="action">
     <i class="material-icons">file_download</i>
-    <span>Download</span>
+    <span>{{ $t('buttons.download') }}</span>
     <span v-if="selectedCount > 0" class="counter">{{ selectedCount }}</span>
   </button>
 </template>
diff --git a/assets/src/components/buttons/Info.vue b/assets/src/components/buttons/Info.vue
index 6e2ef91f..164e59c9 100644
--- a/assets/src/components/buttons/Info.vue
+++ b/assets/src/components/buttons/Info.vue
@@ -1,7 +1,7 @@
 <template>
-  <button title="Info" aria-label="Info" class="action" @click="show">
+  <button :title="$t('buttons.info')" :aria-label="$t('buttons.info')" class="action" @click="show">
     <i class="material-icons">info</i>
-    <span>Info</span>
+    <span>{{ $t('buttons.info') }}</span>
   </button>
 </template>
 
diff --git a/assets/src/components/buttons/Move.vue b/assets/src/components/buttons/Move.vue
index a7b5834d..5d9250f4 100644
--- a/assets/src/components/buttons/Move.vue
+++ b/assets/src/components/buttons/Move.vue
@@ -1,7 +1,7 @@
 <template>
-  <button @click="show" aria-label="Move" title="Move" class="action" id="move-button">
+  <button @click="show" :aria-label="$t('buttons.move')" :title="$t('buttons.move')" class="action" id="move-button">
     <i class="material-icons">forward</i>
-    <span>Move file</span>
+    <span>{{ $t('buttons.moveFile') }}</span>
   </button>
 </template>
 
diff --git a/assets/src/components/buttons/Rename.vue b/assets/src/components/buttons/Rename.vue
index 9b2922b0..a2fd2cbf 100644
--- a/assets/src/components/buttons/Rename.vue
+++ b/assets/src/components/buttons/Rename.vue
@@ -1,7 +1,7 @@
 <template>
-  <button @click="show" aria-label="Rename" title="Rename" class="action" id="rename-button">
+  <button @click="show" :aria-label="$t('buttons.rename')" :title="$t('buttons.rename')" class="action" id="rename-button">
     <i class="material-icons">mode_edit</i>
-    <span>Rename</span>
+    <span>{{ $t('buttons.rename') }}</span>
   </button>
 </template>
 
diff --git a/assets/src/components/buttons/SwitchView.vue b/assets/src/components/buttons/SwitchView.vue
index d4e3fba2..48b1fb1c 100644
--- a/assets/src/components/buttons/SwitchView.vue
+++ b/assets/src/components/buttons/SwitchView.vue
@@ -1,7 +1,7 @@
 <template>
-  <button @click="change" aria-label="Switch View" title="Switch View" class="action" id="switch-view-button">
+  <button @click="change" :aria-label="$t('buttons.switchView')" :title="$t('buttons.switchView')" class="action" id="switch-view-button">
     <i class="material-icons">{{ icon() }}</i>
-    <span>Switch view</span>
+    <span>{{ $t('buttons.switchView') }}</span>
   </button>
 </template>
 
diff --git a/assets/src/components/buttons/Upload.vue b/assets/src/components/buttons/Upload.vue
index a2922ea9..f5d738ad 100644
--- a/assets/src/components/buttons/Upload.vue
+++ b/assets/src/components/buttons/Upload.vue
@@ -1,7 +1,7 @@
 <template>
-  <button @click="upload" aria-label="Upload" title="Upload" class="action" id="upload-button">
+  <button @click="upload" :aria-label="$t('buttons.upload')" :title="$t('buttons.upload')" class="action" id="upload-button">
     <i class="material-icons">file_upload</i>
-    <span>Upload</span>
+    <span>{{ $t('buttons.upload') }}</span>
   </button>
 </template>
 
diff --git a/assets/src/i18n/en.json b/assets/src/i18n/en.json
index b2027635..46d755a3 100644
--- a/assets/src/i18n/en.json
+++ b/assets/src/i18n/en.json
@@ -4,5 +4,17 @@
     "username": "Username",
     "password": "Password",
     "submit": "Login"
+  },
+  "buttons": {
+    "copy": "Copy",
+    "copyFile": "Copy file",
+    "delete": "Delete",
+    "download": "Download",
+    "info": "Info",
+    "move": "Move",
+    "moveFile": "Move file",
+    "rename": "Rename",
+    "switchView": "Swicth view",
+    "upload": "Upload"
   }
 }
diff --git a/assets/src/i18n/index.js b/assets/src/i18n/index.js
index c39130f6..7130c046 100644
--- a/assets/src/i18n/index.js
+++ b/assets/src/i18n/index.js
@@ -7,6 +7,7 @@ Vue.use(VueI18n)
 
 export default new VueI18n({
   locale: 'en',
+  fallbackLocale: 'en',
   messages: {
     'en': en,
     'pt': pt
diff --git a/assets/src/i18n/pt.json b/assets/src/i18n/pt.json
index 33b332c7..a060a255 100644
--- a/assets/src/i18n/pt.json
+++ b/assets/src/i18n/pt.json
@@ -4,5 +4,9 @@
     "username": "Nome de utilizador",
     "password": "Palavra-passe",
     "submit": "Entrar"
+  },
+  "buttons": {
+    "copy": "Copiar",
+    "copyFile": "Copiar ficheiro"
   }
 }
diff --git a/assets/src/router/index.js b/assets/src/router/index.js
index f2090541..ce5f2ced 100644
--- a/assets/src/router/index.js
+++ b/assets/src/router/index.js
@@ -1,6 +1,6 @@
 import Vue from 'vue'
 import Router from 'vue-router'
-import Login from '@/components/Login'
+import Login from '@/views/Login'
 import Main from '@/components/Main'
 import Files from '@/components/files/Files'
 import Users from '@/components/settings/Users'
diff --git a/assets/src/components/Login.vue b/assets/src/views/Login.vue
similarity index 100%
rename from assets/src/components/Login.vue
rename to assets/src/views/Login.vue