diff --git a/app/src/App.vue b/app/src/App.vue
index 7644067d..d0ac5b5c 100644
--- a/app/src/App.vue
+++ b/app/src/App.vue
@@ -33,7 +33,7 @@
     </header>
 
     <!-- MAIN -->
-    <api-wait-overlay>
+    <view-lock-overlay>
       <breadcrumb />
 
       <main id="main">
@@ -44,10 +44,10 @@
         </transition>
         <router-view v-else class="static" :key="$route.fullPath" />
       </main>
-    </api-wait-overlay>
+    </view-lock-overlay>
 
-    <!-- CONSOLE/HISTORY -->
-    <ynh-console />
+    <!-- HISTORY CONSOLE -->
+    <history-console />
 
     <!-- FOOTER -->
     <footer class="py-3 mt-auto">
@@ -76,12 +76,16 @@
 <script>
 import { mapGetters } from 'vuex'
 
-import ApiWaitOverlay from '@/components/ApiWaitOverlay'
-import YnhConsole from '@/components/YnhConsole'
+import { HistoryConsole, ViewLockOverlay } from '@/views/_partials'
 
 export default {
   name: 'App',
 
+  components: {
+    HistoryConsole,
+    ViewLockOverlay
+  },
+
   data () {
     return {
       transitionName: null
@@ -109,11 +113,6 @@ export default {
     }
   },
 
-  components: {
-    ApiWaitOverlay,
-    YnhConsole
-  },
-
   // This hook is only triggered at page first load
   created () {
     // From this hook the value of `connected` always come from the localStorage.
diff --git a/app/src/router/routes.js b/app/src/router/routes.js
index 0b8a029c..59c99865 100644
--- a/app/src/router/routes.js
+++ b/app/src/router/routes.js
@@ -10,7 +10,6 @@
 
 import Home from '@/views/Home'
 import Login from '@/views/Login'
-import ErrorPage from '@/views/ErrorPage'
 import ToolList from '@/views/tool/ToolList'
 
 const routes = [
@@ -29,18 +28,6 @@ const routes = [
     meta: { noAuth: true, breadcrumb: [] }
   },
 
-  /* ────────╮
-   │  ERROR  │
-   ╰──────── */
-  {
-    name: 'error',
-    path: '/error/:type',
-    component: ErrorPage,
-    props: true,
-    // Leave the breadcrumb
-    meta: { noAuth: true, breadcrumb: [] }
-  },
-
   /* ───────────────╮
    │  POST INSTALL  │
    ╰─────────────── */
diff --git a/app/src/views/PostInstall.vue b/app/src/views/PostInstall.vue
index 08fe24e1..a21e03ca 100644
--- a/app/src/views/PostInstall.vue
+++ b/app/src/views/PostInstall.vue
@@ -64,7 +64,7 @@
 
 <script>
 import api from '@/api'
-import { DomainForm, PasswordForm } from '@/components/reusableForms'
+import { DomainForm, PasswordForm } from '@/views/_partials'
 import LoginView from '@/views/Login'
 
 export default {
diff --git a/app/src/views/_partials/HistoryConsole.vue b/app/src/views/_partials/HistoryConsole.vue
index 656e8566..32bc9161 100644
--- a/app/src/views/_partials/HistoryConsole.vue
+++ b/app/src/views/_partials/HistoryConsole.vue
@@ -59,7 +59,7 @@
 import { mapGetters } from 'vuex'
 
 export default {
-  name: 'YnhConsole',
+  name: 'HistoryConsole',
 
   props: {
     value: { type: Boolean, default: false },
diff --git a/app/src/views/_partials/ViewLockOverlay.vue b/app/src/views/_partials/ViewLockOverlay.vue
index 9cf749c3..3da3acfc 100644
--- a/app/src/views/_partials/ViewLockOverlay.vue
+++ b/app/src/views/_partials/ViewLockOverlay.vue
@@ -13,7 +13,7 @@
         </div>
 
         <b-card-body v-if="error">
-          <error-page />
+          <error-display />
         </b-card-body>
 
         <b-card-body v-else class="pb-4">
@@ -40,10 +40,10 @@
 
 <script>
 import { mapGetters } from 'vuex'
-import ErrorPage from '@/views/ErrorPage'
+import { ErrorDisplay } from '@/views/_partials'
 
 export default {
-  name: 'ApiWaitOverlay',
+  name: 'ViewLockOverlay',
 
   computed: {
     ...mapGetters(['waiting', 'lastAction', 'error', 'spinner']),
@@ -63,7 +63,7 @@ export default {
   },
 
   components: {
-    ErrorPage
+    ErrorDisplay
   }
 }
 </script>
@@ -99,7 +99,7 @@ export default {
   &.pacman {
     height: 24px;
     width: 24px;
-    background-image: url('../assets/spinners/pacman.gif');
+    background-image: url('../../assets/spinners/pacman.gif');
     animation-name: back-and-forth-pacman;
 
     @keyframes back-and-forth-pacman {
@@ -113,7 +113,7 @@ export default {
   &.magikarp {
     height: 32px;
     width: 32px;
-    background-image: url('../assets/spinners/magikarp.gif');
+    background-image: url('../../assets/spinners/magikarp.gif');
     animation-name: back-and-forth-magikarp;
 
     @keyframes back-and-forth-magikarp {
@@ -127,7 +127,7 @@ export default {
   &.nyancat {
     height: 40px;
     width: 100px;
-    background-image: url('../assets/spinners/nyancat.gif');
+    background-image: url('../../assets/spinners/nyancat.gif');
     animation-name: back-and-forth-nyancat;
 
     @keyframes back-and-forth-nyancat {
diff --git a/app/src/views/_partials/index.js b/app/src/views/_partials/index.js
index dcd04c0c..6ce589ef 100644
--- a/app/src/views/_partials/index.js
+++ b/app/src/views/_partials/index.js
@@ -1,2 +1,5 @@
-export { default as PasswordForm } from './PasswordForm'
+export { default as ErrorDisplay } from './ErrorDisplay'
+export { default as HistoryConsole } from './HistoryConsole'
+export { default as ViewLockOverlay } from './ViewLockOverlay'
 export { default as DomainForm } from './DomainForm'
+export { default as PasswordForm } from './PasswordForm'
diff --git a/app/src/views/domain/DomainAdd.vue b/app/src/views/domain/DomainAdd.vue
index c2fc6f02..bd22dbe3 100644
--- a/app/src/views/domain/DomainAdd.vue
+++ b/app/src/views/domain/DomainAdd.vue
@@ -8,7 +8,7 @@
 </template>
 
 <script>
-import { DomainForm } from '@/components/reusableForms'
+import { DomainForm } from '@/views/_partials'
 
 export default {
   name: 'DomainAdd',
diff --git a/app/src/views/tool/ToolAdminpw.vue b/app/src/views/tool/ToolAdminpw.vue
index 1426421a..18d6ad6c 100644
--- a/app/src/views/tool/ToolAdminpw.vue
+++ b/app/src/views/tool/ToolAdminpw.vue
@@ -11,7 +11,7 @@
 import api from '@/api'
 import { validationMixin } from 'vuelidate'
 
-import { PasswordForm } from '@/components/reusableForms'
+import { PasswordForm } from '@/views/_partials'
 import { required, minLength } from '@/helpers/validators'
 
 export default {