diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index d1e4da2d..816e3294 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -41,7 +41,7 @@
     "/chunks/files~chunks/oasis/invoices/list~chunks/oasis/platba~chunks/settings-subscription~chunks/shar~d6675e1e.js": "/chunks/files~chunks/oasis/invoices/list~chunks/oasis/platba~chunks/settings-subscription~chunks/shar~d6675e1e.js?id=effef49b99446fdaee0b",
     "/chunks/files~chunks/oasis/invoices/list~chunks/platform~chunks/shared-files~chunks/shared/file-browser.js": "/chunks/files~chunks/oasis/invoices/list~chunks/platform~chunks/shared-files~chunks/shared/file-browser.js?id=c777877000f1e219a748",
     "/chunks/files~chunks/oasis/invoices/list~chunks/shared-files~chunks/shared/file-browser.js": "/chunks/files~chunks/oasis/invoices/list~chunks/shared-files~chunks/shared/file-browser.js?id=c6fc1ec1f0bf1b367c92",
-    "/chunks/files~chunks/oasis/invoices~chunks/oasis/invoices/list~chunks/platform~chunks/shared~chunks/s~87b39a8d.js": "/chunks/files~chunks/oasis/invoices~chunks/oasis/invoices/list~chunks/platform~chunks/shared~chunks/s~87b39a8d.js?id=8330f58f94520d8fd0fb",
+    "/chunks/files~chunks/oasis/invoices~chunks/oasis/invoices/list~chunks/platform~chunks/shared~chunks/s~87b39a8d.js": "/chunks/files~chunks/oasis/invoices~chunks/oasis/invoices/list~chunks/platform~chunks/shared~chunks/s~87b39a8d.js?id=c226fe89b510c599615f",
     "/chunks/files~chunks/oasis/invoices~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/f~9f6a6eef.js": "/chunks/files~chunks/oasis/invoices~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/f~9f6a6eef.js?id=9bc0d89f45dff1feb308",
     "/chunks/files~chunks/shared-files~chunks/shared/file-browser.js": "/chunks/files~chunks/shared-files~chunks/shared/file-browser.js?id=14b259c05259260985ec",
     "/chunks/files~chunks/shared-files~chunks/shared/file-browser~chunks/shared/single-file.js": "/chunks/files~chunks/shared-files~chunks/shared/file-browser~chunks/shared/single-file.js?id=06665bebae33953fed87",
@@ -52,9 +52,9 @@
     "/chunks/invoices.js": "/chunks/invoices.js?id=1deb187f6d3eb1e81ad0",
     "/chunks/not-found-shared.js": "/chunks/not-found-shared.js?id=7fc7f9b6f10bdfac770e",
     "/chunks/oasis/homepage.js": "/chunks/oasis/homepage.js?id=a1885dd8814f9eb63a1c",
-    "/chunks/oasis/invoices.js": "/chunks/oasis/invoices.js?id=63e7567dcc370b5c88d0",
-    "/chunks/oasis/invoices/list.js": "/chunks/oasis/invoices/list.js?id=9da3d326829139f2addd",
-    "/chunks/oasis/invoices~chunks/platform~chunks/shared.js": "/chunks/oasis/invoices~chunks/platform~chunks/shared.js?id=9ad184d8e96c7d04941c",
+    "/chunks/oasis/invoices.js": "/chunks/oasis/invoices.js?id=30278fb5c1b753cf4094",
+    "/chunks/oasis/invoices/list.js": "/chunks/oasis/invoices/list.js?id=3f569f48e82c6a309607",
+    "/chunks/oasis/invoices~chunks/platform~chunks/shared.js": "/chunks/oasis/invoices~chunks/platform~chunks/shared.js?id=28a7253b6d421716fe94",
     "/chunks/oasis/platba.js": "/chunks/oasis/platba.js?id=53d9f2a31b1dd5dad85e",
     "/chunks/oasis/platba~chunks/oasis/upgrade-billing~chunks/oasis/upgrade-plan~chunks/upgrade-billing~ch~6880400b.js": "/chunks/oasis/platba~chunks/oasis/upgrade-billing~chunks/oasis/upgrade-plan~chunks/upgrade-billing~ch~6880400b.js?id=0c8d1c3cca084baa177f",
     "/chunks/oasis/sign-up.js": "/chunks/oasis/sign-up.js?id=e53eeb48ebabae259f9c",
@@ -71,7 +71,7 @@
     "/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js?id=08e2056bc3744b2ea8f9",
     "/chunks/plans.js": "/chunks/plans.js?id=5e1c668e35d2f04973b7",
     "/chunks/platform.js": "/chunks/platform.js?id=f463eed74ce0e6852b6d",
-    "/chunks/platform~chunks/shared.js": "/chunks/platform~chunks/shared.js?id=ec633fb6ff41c34084c8",
+    "/chunks/platform~chunks/shared.js": "/chunks/platform~chunks/shared.js?id=7e96470b4052320d20b0",
     "/chunks/profile.js": "/chunks/profile.js?id=1c1c666004fb44b1c404",
     "/chunks/profile~chunks/settings-password.js": "/chunks/profile~chunks/settings-password.js?id=d0a44ee2cc3e9882c14a",
     "/chunks/purchase-code.js": "/chunks/purchase-code.js?id=a1e46acc22ce82b2a61b",
@@ -147,7 +147,7 @@
     "/js/main.7f61c82e2287c754ca38.hot-update.js": "/js/main.7f61c82e2287c754ca38.hot-update.js",
     "/chunks/admin~chunks/files~chunks/oasis/invoices~chunks/platform~chunks/shared~chunks/shared-files~ch~d5261757.js": "/chunks/admin~chunks/files~chunks/oasis/invoices~chunks/platform~chunks/shared~chunks/shared-files~ch~d5261757.js?id=d21fb57bf57311960d1d",
     "/chunks/app-language~chunks/dashboard~chunks/dashboard-oasis~chunks/files~chunks/invoices~chunks/oasi~be89c0bb.js": "/chunks/app-language~chunks/dashboard~chunks/dashboard-oasis~chunks/files~chunks/invoices~chunks/oasi~be89c0bb.js?id=b3e30c8dd757237db0e2",
-    "/chunks/files~chunks/oasis/invoices~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/f~5c41de43.js": "/chunks/files~chunks/oasis/invoices~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/f~5c41de43.js?id=82783fb4be9549d57cbe",
+    "/chunks/files~chunks/oasis/invoices~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/f~5c41de43.js": "/chunks/files~chunks/oasis/invoices~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/f~5c41de43.js?id=b75499cc3e4f50c4a12a",
     "/chunks/files~chunks/oasis/platba~chunks/settings-subscription~chunks/shared-files~chunks/shared/file~9d1352fd.js": "/chunks/files~chunks/oasis/platba~chunks/settings-subscription~chunks/shared-files~chunks/shared/file~9d1352fd.js?id=4030b241faac6b31341f",
     "/chunks/files~chunks/platform~chunks/shared-files~chunks/shared/file-browser.js": "/chunks/files~chunks/platform~chunks/shared-files~chunks/shared/file-browser.js?id=6808db2deb2d07287ce9",
     "/chunks/oasis/invoices/list.7f61c82e2287c754ca38.hot-update.js": "/chunks/oasis/invoices/list.7f61c82e2287c754ca38.hot-update.js",
@@ -162,5 +162,51 @@
     "/chunks/oasis/invoices/list.176280fa58d9259de7dd.hot-update.js": "/chunks/oasis/invoices/list.176280fa58d9259de7dd.hot-update.js",
     "/chunks/oasis/invoices/list.160b226c79c7f19a172a.hot-update.js": "/chunks/oasis/invoices/list.160b226c79c7f19a172a.hot-update.js",
     "/chunks/oasis/invoices/list.a291cdab527404d85d0b.hot-update.js": "/chunks/oasis/invoices/list.a291cdab527404d85d0b.hot-update.js",
-    "/chunks/oasis/invoices/list.0a15b78a6cc57168a270.hot-update.js": "/chunks/oasis/invoices/list.0a15b78a6cc57168a270.hot-update.js"
+    "/chunks/oasis/invoices/list.0a15b78a6cc57168a270.hot-update.js": "/chunks/oasis/invoices/list.0a15b78a6cc57168a270.hot-update.js",
+    "/chunks/oasis/invoices.54338050da43003847dc.hot-update.js": "/chunks/oasis/invoices.54338050da43003847dc.hot-update.js",
+    "/chunks/oasis/invoices.33433d4ef3693cb00cfa.hot-update.js": "/chunks/oasis/invoices.33433d4ef3693cb00cfa.hot-update.js",
+    "/chunks/oasis/invoices.451736de879c6e3876f0.hot-update.js": "/chunks/oasis/invoices.451736de879c6e3876f0.hot-update.js",
+    "/chunks/oasis/invoices/list.6086b0e2c3448c7ff365.hot-update.js": "/chunks/oasis/invoices/list.6086b0e2c3448c7ff365.hot-update.js",
+    "/chunks/oasis/invoices.3e17d165c26a317bc62b.hot-update.js": "/chunks/oasis/invoices.3e17d165c26a317bc62b.hot-update.js",
+    "/chunks/oasis/invoices.727c2b97e5741635f33c.hot-update.js": "/chunks/oasis/invoices.727c2b97e5741635f33c.hot-update.js",
+    "/chunks/files~chunks/oasis/invoices~chunks/oasis/invoices/list~chunks/platform~chunks/shared~chunks/s~87b39a8d.d7eadb8ab7fb0d5d66b8.hot-update.js": "/chunks/files~chunks/oasis/invoices~chunks/oasis/invoices/list~chunks/platform~chunks/shared~chunks/s~87b39a8d.d7eadb8ab7fb0d5d66b8.hot-update.js",
+    "/chunks/oasis/invoices.d7eadb8ab7fb0d5d66b8.hot-update.js": "/chunks/oasis/invoices.d7eadb8ab7fb0d5d66b8.hot-update.js",
+    "/chunks/files~chunks/oasis/invoices~chunks/oasis/invoices/list~chunks/platform~chunks/shared~chunks/s~87b39a8d.12e2f2f4a2f12902eb15.hot-update.js": "/chunks/files~chunks/oasis/invoices~chunks/oasis/invoices/list~chunks/platform~chunks/shared~chunks/s~87b39a8d.12e2f2f4a2f12902eb15.hot-update.js",
+    "/chunks/oasis/invoices.066072ad15cf9351e17d.hot-update.js": "/chunks/oasis/invoices.066072ad15cf9351e17d.hot-update.js",
+    "/chunks/files~chunks/oasis/invoices~chunks/oasis/invoices/list~chunks/platform~chunks/shared~chunks/s~87b39a8d.7a7367af268d8f5a7353.hot-update.js": "/chunks/files~chunks/oasis/invoices~chunks/oasis/invoices/list~chunks/platform~chunks/shared~chunks/s~87b39a8d.7a7367af268d8f5a7353.hot-update.js",
+    "/chunks/files~chunks/oasis/invoices~chunks/oasis/invoices/list~chunks/platform~chunks/shared~chunks/s~87b39a8d.d5129094feb45c865adf.hot-update.js": "/chunks/files~chunks/oasis/invoices~chunks/oasis/invoices/list~chunks/platform~chunks/shared~chunks/s~87b39a8d.d5129094feb45c865adf.hot-update.js",
+    "/chunks/files~chunks/oasis/invoices~chunks/oasis/invoices/list~chunks/platform~chunks/shared~chunks/s~87b39a8d.186d7f3428077fd9831d.hot-update.js": "/chunks/files~chunks/oasis/invoices~chunks/oasis/invoices/list~chunks/platform~chunks/shared~chunks/s~87b39a8d.186d7f3428077fd9831d.hot-update.js",
+    "/chunks/files~chunks/oasis/invoices~chunks/oasis/invoices/list~chunks/platform~chunks/shared~chunks/s~87b39a8d.51b69978b01279cc85bf.hot-update.js": "/chunks/files~chunks/oasis/invoices~chunks/oasis/invoices/list~chunks/platform~chunks/shared~chunks/s~87b39a8d.51b69978b01279cc85bf.hot-update.js",
+    "/chunks/files~chunks/oasis/invoices~chunks/oasis/invoices/list~chunks/platform~chunks/shared~chunks/s~87b39a8d.abd3d9e0de7830715ab6.hot-update.js": "/chunks/files~chunks/oasis/invoices~chunks/oasis/invoices/list~chunks/platform~chunks/shared~chunks/s~87b39a8d.abd3d9e0de7830715ab6.hot-update.js",
+    "/chunks/oasis/invoices.48ff69d07f70de183e72.hot-update.js": "/chunks/oasis/invoices.48ff69d07f70de183e72.hot-update.js",
+    "/chunks/oasis/invoices.1c07c4de99af31eff232.hot-update.js": "/chunks/oasis/invoices.1c07c4de99af31eff232.hot-update.js",
+    "/js/main.2d282f646c1e3e56d030.hot-update.js": "/js/main.2d282f646c1e3e56d030.hot-update.js",
+    "/chunks/oasis/invoices/list.2d282f646c1e3e56d030.hot-update.js": "/chunks/oasis/invoices/list.2d282f646c1e3e56d030.hot-update.js",
+    "/chunks/oasis/invoices.a6c9317cb0e7b6c0b758.hot-update.js": "/chunks/oasis/invoices.a6c9317cb0e7b6c0b758.hot-update.js",
+    "/js/main.c0c043177d89ef71ea72.hot-update.js": "/js/main.c0c043177d89ef71ea72.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared/file-browser.c0c043177d89ef71ea72.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared/file-browser.c0c043177d89ef71ea72.hot-update.js",
+    "/chunks/oasis/invoices.c0c043177d89ef71ea72.hot-update.js": "/chunks/oasis/invoices.c0c043177d89ef71ea72.hot-update.js",
+    "/chunks/oasis/invoices/list.c0c043177d89ef71ea72.hot-update.js": "/chunks/oasis/invoices/list.c0c043177d89ef71ea72.hot-update.js",
+    "/chunks/oasis/invoices.7bf71b0359f6c3fd31d1.hot-update.js": "/chunks/oasis/invoices.7bf71b0359f6c3fd31d1.hot-update.js",
+    "/js/main.4557463991f855dee610.hot-update.js": "/js/main.4557463991f855dee610.hot-update.js",
+    "/chunks/app-language~chunks/dashboard~chunks/dashboard-oasis~chunks/files~chunks/invoices~chunks/oasi~cd3e6128.js": "/chunks/app-language~chunks/dashboard~chunks/dashboard-oasis~chunks/files~chunks/invoices~chunks/oasi~cd3e6128.js?id=f48f98e1528ed423c30e",
+    "/chunks/files~chunks/oasis/invoices~chunks/oasis/invoices/list~chunks/oasis/platba~chunks/settings-su~50fe86ed.js": "/chunks/files~chunks/oasis/invoices~chunks/oasis/invoices/list~chunks/oasis/platba~chunks/settings-su~50fe86ed.js?id=623f7615840be8374dcf",
+    "/chunks/files~chunks/oasis/invoices~chunks/oasis/invoices/list~chunks/platform~chunks/shared-files~ch~e5a24789.js": "/chunks/files~chunks/oasis/invoices~chunks/oasis/invoices/list~chunks/platform~chunks/shared-files~ch~e5a24789.js?id=8a936fa4187b27beddd8",
+    "/chunks/files~chunks/oasis/invoices~chunks/oasis/invoices/list~chunks/shared-files~chunks/shared/file-browser.js": "/chunks/files~chunks/oasis/invoices~chunks/oasis/invoices/list~chunks/shared-files~chunks/shared/file-browser.js?id=ae9c429fd445f68f369f",
+    "/chunks/oasis/invoices.4557463991f855dee610.hot-update.js": "/chunks/oasis/invoices.4557463991f855dee610.hot-update.js",
+    "/chunks/oasis/invoices~chunks/platform~chunks/shared.4557463991f855dee610.hot-update.js": "/chunks/oasis/invoices~chunks/platform~chunks/shared.4557463991f855dee610.hot-update.js",
+    "/chunks/shared.4557463991f855dee610.hot-update.js": "/chunks/shared.4557463991f855dee610.hot-update.js",
+    "/chunks/oasis/invoices.c1c765cf334634f8bb4a.hot-update.js": "/chunks/oasis/invoices.c1c765cf334634f8bb4a.hot-update.js",
+    "/js/main.ff6244ee2f7e17d2e294.hot-update.js": "/js/main.ff6244ee2f7e17d2e294.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/oasis/invoices~chunks/oasis/invoices/list~chunks/settings~chunks/sh~8ea3b78d.js": "/chunks/admin~chunks/files~chunks/oasis/invoices~chunks/oasis/invoices/list~chunks/settings~chunks/sh~8ea3b78d.js?id=5c713b78eab271be9d39",
+    "/chunks/admin~chunks/oasis/invoices~chunks/oasis/invoices/list~chunks/platform.js": "/chunks/admin~chunks/oasis/invoices~chunks/oasis/invoices/list~chunks/platform.js?id=8a43df56801fc2065bcb",
+    "/chunks/admin~chunks/oasis/invoices~chunks/oasis/invoices/list~chunks/platform~chunks/shared.js": "/chunks/admin~chunks/oasis/invoices~chunks/oasis/invoices/list~chunks/platform~chunks/shared.js?id=a0543d93d8f11a2a5962",
+    "/chunks/files~chunks/oasis/invoices~chunks/oasis/invoices/list~chunks/platform~chunks/shared~chunks/s~707bd579.js": "/chunks/files~chunks/oasis/invoices~chunks/oasis/invoices/list~chunks/platform~chunks/shared~chunks/s~707bd579.js?id=3c49df5afaf5bb1f42f3",
+    "/chunks/files~chunks/oasis/invoices~chunks/oasis/invoices/list~chunks/platform~chunks/shared~chunks/s~87b39a8d.ff6244ee2f7e17d2e294.hot-update.js": "/chunks/files~chunks/oasis/invoices~chunks/oasis/invoices/list~chunks/platform~chunks/shared~chunks/s~87b39a8d.ff6244ee2f7e17d2e294.hot-update.js",
+    "/chunks/oasis/invoices.ff6244ee2f7e17d2e294.hot-update.js": "/chunks/oasis/invoices.ff6244ee2f7e17d2e294.hot-update.js",
+    "/chunks/oasis/invoices~chunks/oasis/invoices/list.js": "/chunks/oasis/invoices~chunks/oasis/invoices/list.js?id=e558d42270d3546150ed",
+    "/chunks/oasis/invoices~chunks/oasis/invoices/list~chunks/platform~chunks/shared.js": "/chunks/oasis/invoices~chunks/oasis/invoices/list~chunks/platform~chunks/shared.js?id=750a1e714440c4f03c2f",
+    "/vendors~chunks/files~chunks/oasis/invoices~chunks/oasis/invoices/list~chunks/platform~chunks/shared~~c9df84c5.js": "/vendors~chunks/files~chunks/oasis/invoices~chunks/oasis/invoices/list~chunks/platform~chunks/shared~~c9df84c5.js?id=4d042d0c0d8477a4f7ac",
+    "/vendors~chunks/oasis/invoices~chunks/oasis/invoices/list~chunks/platform~chunks/shared.js": "/vendors~chunks/oasis/invoices~chunks/oasis/invoices/list~chunks/platform~chunks/shared.js?id=11378342c3b6251c133e",
+    "/chunks/oasis/invoices~chunks/oasis/invoices/list.b6331b0d83b19d605c15.hot-update.js": "/chunks/oasis/invoices~chunks/oasis/invoices/list.b6331b0d83b19d605c15.hot-update.js"
 }
diff --git a/resources/js/Oasis/Modules/Invoices/List.vue b/resources/js/Oasis/Modules/Invoices/ContentInvoiceView.vue
similarity index 97%
rename from resources/js/Oasis/Modules/Invoices/List.vue
rename to resources/js/Oasis/Modules/Invoices/ContentInvoiceView.vue
index 6abf53bf..8d1209cf 100644
--- a/resources/js/Oasis/Modules/Invoices/List.vue
+++ b/resources/js/Oasis/Modules/Invoices/ContentInvoiceView.vue
@@ -13,7 +13,7 @@
 	import {events} from '@/bus'
 
 	export default {
-		name: 'FilesView',
+		name: 'ContentInvoiceView',
 		components: {
 			InvoiceDesktopToolbar,
 			InvoiceContextMenu,
diff --git a/resources/js/Oasis/Modules/Invoices/Invoice.vue b/resources/js/Oasis/Modules/Invoices/Invoice.vue
new file mode 100644
index 00000000..f73c6272
--- /dev/null
+++ b/resources/js/Oasis/Modules/Invoices/Invoice.vue
@@ -0,0 +1,92 @@
+<template>
+    <div id="application-wrapper">
+
+		<!--File preview window-->
+        <FilePreview />
+
+		<InvoiceMobileMenu />
+		<ClientMobileMenu />
+		<InvoiceCreateMenu />
+		<InvoiceFilterMobile />
+		<InvoiceSortingMobile />
+
+		<!--Navigations-->
+        <MobileNavigation />
+        <SidebarNavigation />
+
+		<router-view :class="{'is-scaled-down': isScaledDown}" />
+    </div>
+</template>
+
+<script>
+    import InvoiceSortingMobile from '@/Oasis/Modules/Invoices/components/InvoiceSortingMobile'
+	import InvoiceFilterMobile from '@/Oasis/Modules/Invoices/components/InvoiceFilterMobile'
+	import InvoiceMobileMenu from '@/Oasis/Modules/Invoices/components/InvoiceMobileMenu'
+	import ClientMobileMenu from '@/Oasis/Modules/Invoices/components/ClientMobileMenu'
+	import InvoiceCreateMenu from '@/Oasis/Modules/Invoices/components/InvoiceCreateMenu'
+
+	import {UsersIcon, FileTextIcon, ClockIcon} from 'vue-feather-icons'
+	import SidebarNavigation from '@/components/Sidebar/SidebarNavigation'
+	import MobileNavigation from '@/components/Others/MobileNavigation'
+	import ContentSidebar from '@/components/Sidebar/ContentSidebar'
+	import FilePreview from '@/components/FilesView/FilePreview'
+	import ContentGroup from '@/components/Sidebar/ContentGroup'
+	import {mapGetters} from 'vuex'
+	import {events} from '@/bus'
+
+	export default {
+		name: 'Settings',
+		computed: {
+			...mapGetters([
+				'config'
+			]),
+		},
+		components: {
+			InvoiceSortingMobile,
+			InvoiceFilterMobile,
+			InvoiceCreateMenu,
+			InvoiceMobileMenu,
+			SidebarNavigation,
+			ClientMobileMenu,
+			MobileNavigation,
+			ContentSidebar,
+			FileTextIcon,
+			ContentGroup,
+			FilePreview,
+			UsersIcon,
+			ClockIcon,
+		},
+		data() {
+			return {
+				isScaledDown: false,
+			}
+		},
+		methods: {
+			goTo(location) {
+				let routes = {
+					'invoices': 'getInvoices',
+					'advance-invoices': 'getAdvanceInvoices',
+					'clients': 'getClients',
+				}
+				this.$store.dispatch(routes[location])
+			}
+		},
+		mounted() {
+			events.$on('mobile-menu:show', () => this.isScaledDown = true)
+
+			events.$on('fileItem:deselect', () => this.isScaledDown = false)
+			events.$on('mobile-menu:hide', () => this.isScaledDown = false)
+		}
+	}
+</script>
+
+<style lang="scss">
+    @import '@assets/vuefilemanager/_mixins';
+
+	@media only screen and (max-width: 690px) {
+
+		.is-scaled-down {
+			@include transform(scale(0.95));
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/resources/js/Oasis/Modules/Invoices/Invoices.vue b/resources/js/Oasis/Modules/Invoices/Invoices.vue
index fbfd085e..04cb5b62 100644
--- a/resources/js/Oasis/Modules/Invoices/Invoices.vue
+++ b/resources/js/Oasis/Modules/Invoices/Invoices.vue
@@ -1,18 +1,6 @@
 <template>
     <section id="viewport">
 
-		<!--File preview window-->
-        <FilePreview />
-
-		<InvoiceMobileMenu />
-		<InvoiceCreateMenu />
-		<InvoiceFilterMobile />
-		<InvoiceSortingMobile />
-
-		<!--Navigations-->
-        <MobileNavigation />
-        <SidebarNavigation />
-
 		<!--Sidebar navigation-->
         <ContentSidebar>
             <ContentGroup title="Invoices" class="navigator menu-list-wrapper vertical">
@@ -45,14 +33,16 @@
             </ContentGroup>
         </ContentSidebar>
 
-		<router-view :class="{'is-scaled-down': isScaledDown}" />
+		<ContentInvoiceView />
     </section>
 </template>
 
 <script>
+    import ContentInvoiceView from '@/Oasis/Modules/Invoices/ContentInvoiceView'
     import InvoiceSortingMobile from '@/Oasis/Modules/Invoices/components/InvoiceSortingMobile'
 	import InvoiceFilterMobile from '@/Oasis/Modules/Invoices/components/InvoiceFilterMobile'
 	import InvoiceMobileMenu from '@/Oasis/Modules/Invoices/components/InvoiceMobileMenu'
+	import ClientMobileMenu from '@/Oasis/Modules/Invoices/components/ClientMobileMenu'
 	import InvoiceCreateMenu from '@/Oasis/Modules/Invoices/components/InvoiceCreateMenu'
 
 	import {UsersIcon, FileTextIcon, ClockIcon} from 'vue-feather-icons'
@@ -72,11 +62,13 @@
 			]),
 		},
 		components: {
+			ContentInvoiceView,
 			InvoiceSortingMobile,
 			InvoiceFilterMobile,
 			InvoiceCreateMenu,
 			InvoiceMobileMenu,
 			SidebarNavigation,
+			ClientMobileMenu,
 			MobileNavigation,
 			ContentSidebar,
 			FileTextIcon,
diff --git a/resources/js/Oasis/Modules/Invoices/components/ClientItem.vue b/resources/js/Oasis/Modules/Invoices/components/ClientItem.vue
index 259c7819..bedee97b 100644
--- a/resources/js/Oasis/Modules/Invoices/components/ClientItem.vue
+++ b/resources/js/Oasis/Modules/Invoices/components/ClientItem.vue
@@ -78,7 +78,7 @@ export default {
             this.$store.commit('CLIPBOARD_CLEAR')
             this.$store.commit('ADD_ITEM_TO_CLIPBOARD', this.item)
 
-            events.$emit('mobile-menu:show', 'invoice-menu')
+            events.$emit('mobile-menu:show', 'client-menu')
         },
         clickedItem(e) {
             if (!this.$isMobile()) {
diff --git a/resources/js/Oasis/Modules/Invoices/components/ClientMobileMenu.vue b/resources/js/Oasis/Modules/Invoices/components/ClientMobileMenu.vue
new file mode 100644
index 00000000..3b502436
--- /dev/null
+++ b/resources/js/Oasis/Modules/Invoices/components/ClientMobileMenu.vue
@@ -0,0 +1,65 @@
+<template>
+    <MenuMobile name="client-menu">
+		<TitlePreview
+			v-if="clipboard[0]"
+			class="headline"
+			:avatar="clipboard[0].avatar"
+			:title="clipboard[0].name"
+			:subtitle="clipboard[0].email"
+		/>
+
+        <MenuMobileGroup>
+            <OptionGroup class="menu-option-group">
+                <Option @click.native="" title="Edit" icon="rename" />
+                <Option @click.native="deleteItem" title="Delete" icon="trash" />
+            </OptionGroup>
+            <OptionGroup>
+                <Option @click.native="showDetail" :title="$t('context_menu.detail')" icon="detail" />
+            </OptionGroup>
+        </MenuMobileGroup>
+    </MenuMobile>
+</template>
+
+<script>
+import MenuMobileGroup from '@/components/Mobile/MenuMobileGroup'
+import TitlePreview from '@/components/FilesView/TitlePreview'
+import ThumbnailItem from '@/components/Others/ThumbnailItem'
+import OptionGroup from '@/components/FilesView/OptionGroup'
+import MenuMobile from '@/components/Mobile/MenuMobile'
+import Option from '@/components/FilesView/Option'
+import {mapGetters} from 'vuex'
+
+export default {
+    name: 'FileMenuMobile',
+    components: {
+        MenuMobileGroup,
+        ThumbnailItem,
+		TitlePreview,
+        OptionGroup,
+        MenuMobile,
+        Option,
+    },
+    computed: {
+        ...mapGetters([
+            'clipboard',
+            'user',
+        ]),
+    },
+    data() {
+        return {
+            isVisible: false,
+        }
+    },
+    methods: {
+
+    }
+}
+</script>
+
+<style scoped lang="scss">
+
+	.headline {
+		padding: 20px 20px 10px;
+		margin-bottom: 0;
+	}
+</style>
diff --git a/resources/js/components/FilesView/TitlePreview.vue b/resources/js/components/FilesView/TitlePreview.vue
index a800d846..e1f7f865 100644
--- a/resources/js/components/FilesView/TitlePreview.vue
+++ b/resources/js/components/FilesView/TitlePreview.vue
@@ -1,6 +1,9 @@
 <template>
-    <div class="wrapper">
-        <div class="icon-wrapper">
+    <div class="wrapper" :class="{'center': avatar}">
+        <div v-if="avatar" class="avatar-wrapper">
+			<img :src="avatar" alt="">
+        </div>
+        <div v-if="icon" class="icon-wrapper">
             <CheckSquareIcon v-if="icon === 'check-square'" class="icon text-theme" size="21" />
 			<image-icon v-if="icon === 'image'" class="icon text-theme" size="21" />
 			<video-icon v-if="icon === 'video'" class="icon text-theme" size="21" />
@@ -31,6 +34,7 @@ export default {
     name: 'TitlePreview',
     props: [
         'subtitle',
+        'avatar',
         'title',
         'icon',
     ],
@@ -54,6 +58,10 @@ export default {
     display: flex;
     align-items: flex-start;
 
+	&.center {
+		align-items: center;
+	}
+
     .text {
         padding-left: 10px;
         width: 100%;
@@ -75,6 +83,16 @@ export default {
         }
     }
 
+	.avatar-wrapper {
+		line-height: 0;
+
+		img {
+			border-radius: 9px;
+			width: 52px;
+			height: 52px;
+		}
+	}
+
     .icon-wrapper {
 
         polyline, path, rect, circle, polyline, line {
diff --git a/resources/js/router.js b/resources/js/router.js
index 974ee899..47fe9c7a 100644
--- a/resources/js/router.js
+++ b/resources/js/router.js
@@ -74,9 +74,9 @@ const routesOasis = [
     },
     {
         name: 'Invoicing',
-        path: '/invoices',
+        path: '/invoice',
         component: () =>
-            import(/* webpackChunkName: "chunks/oasis/invoices" */ './Oasis/Modules/Invoices/Invoices'),
+            import(/* webpackChunkName: "chunks/oasis/invoices" */ './Oasis/Modules/Invoices/Invoice'),
         meta: {
             requiresAuth: true,
             title: 'Faktúry'
@@ -84,9 +84,9 @@ const routesOasis = [
         children: [
             {
                 name: 'InvoicesList',
-                path: '/invoices/all',
+                path: '/invoice/invoices',
                 component: () =>
-                    import(/* webpackChunkName: "chunks/oasis/invoices/list" */ './Oasis/Modules/Invoices/List'),
+                    import(/* webpackChunkName: "chunks/oasis/invoices/list" */ './Oasis/Modules/Invoices/Invoices'),
                 meta: {
                     requiresAuth: true,
                     title: 'Invoices'