diff --git a/resources/js/app.js b/resources/js/app.js
index 8338eba8..d117628d 100644
--- a/resources/js/app.js
+++ b/resources/js/app.js
@@ -8,7 +8,7 @@ import FSelect from './components/FSelect.vue';
 import FTextarea from './components/FTextarea.vue';
 import Pages from './components/Pages.vue';
 import VBool from './components/VBool.vue';
-import App from './layouts/App.vue';
+import AppLayout from './layouts/AppLayout.vue';
 import VTooltip from 'v-tooltip';
 import hasModule from './mixins/hasModule.js';
 
@@ -35,7 +35,7 @@ new Vue({
                 var page = require(`./views/${name}`).default;
 
                 if (page.layout === undefined) {
-                    page.layout = App;
+                    page.layout = AppLayout;
                 }
                 return page;
             }
diff --git a/resources/js/layouts/App.vue b/resources/js/layouts/AppLayout.vue
similarity index 100%
rename from resources/js/layouts/App.vue
rename to resources/js/layouts/AppLayout.vue
diff --git a/resources/js/layouts/Full.vue b/resources/js/layouts/FullLayout.vue
similarity index 100%
rename from resources/js/layouts/Full.vue
rename to resources/js/layouts/FullLayout.vue
diff --git a/resources/js/mixins/mergesQueryString.js b/resources/js/mixins/mergesQueryString.js
index f110a103..1e595fd9 100644
--- a/resources/js/mixins/mergesQueryString.js
+++ b/resources/js/mixins/mergesQueryString.js
@@ -1,5 +1,4 @@
 import queryString from 'query-string';
-import merge from 'merge';
 
 export default {
     methods: {
diff --git a/resources/js/views/Initialize/VIndex.vue b/resources/js/views/Initialize/VIndex.vue
index b5e7f8bf..792d6b16 100644
--- a/resources/js/views/Initialize/VIndex.vue
+++ b/resources/js/views/Initialize/VIndex.vue
@@ -5,12 +5,3 @@
     </div>
 </template>
 
-<script>
-import App from '../../layouts/App';
-
-export default {
-    
-    layout: App
-
-};
-</script>
diff --git a/resources/js/views/VLogin.vue b/resources/js/views/VLogin.vue
index 8561d2d0..0b7dd330 100644
--- a/resources/js/views/VLogin.vue
+++ b/resources/js/views/VLogin.vue
@@ -13,10 +13,10 @@
 </template>
 
 <script>
-import Full from '../layouts/Full';
+import FullLayout from '../layouts/FullLayout';
 
 export default {
-    layout: Full,
+    layout: FullLayout,
 
     data: function() {
         return {
diff --git a/resources/js/views/home/VIndex.vue b/resources/js/views/home/VIndex.vue
index 9864c27d..07ee364f 100644
--- a/resources/js/views/home/VIndex.vue
+++ b/resources/js/views/home/VIndex.vue
@@ -24,11 +24,7 @@
 </template>
 
 <script>
-import App from '../../layouts/App';
-
 export default {
-    layout: App,
-
     props: {
         data: {},
         blocks: {}
diff --git a/resources/js/views/member/VIndex.vue b/resources/js/views/member/VIndex.vue
index dbe93ef1..4347067f 100644
--- a/resources/js/views/member/VIndex.vue
+++ b/resources/js/views/member/VIndex.vue
@@ -74,7 +74,6 @@
 </template>
 
 <script>
-import App from '../../layouts/App';
 import MemberPayments from './MemberPayments.vue';
 import MemberMemberships from './MemberMemberships.vue';
 import MemberCourses from './MemberCourses.vue';
@@ -90,8 +89,6 @@ export default {
         };
     },
 
-    layout: App,
-
     mixins: [mergesQueryString],
 
     components: { MemberMemberships, MemberPayments, MemberFilter, MemberCourses },
diff --git a/resources/js/views/subscription/SubscriptionIndex.vue b/resources/js/views/subscription/SubscriptionIndex.vue
index cfae4ab1..47584b8b 100644
--- a/resources/js/views/subscription/SubscriptionIndex.vue
+++ b/resources/js/views/subscription/SubscriptionIndex.vue
@@ -23,11 +23,7 @@
 </template>
 
 <script>
-import App from '../../layouts/App';
-
 export default {
-    layout: App,
-
     props:{
         data: {}
     }