diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 93d198d5..f447454d 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -52,8 +52,8 @@
     "/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=4d0836e46f76927fd0f2",
-    "/chunks/oasis/invoices/list.js": "/chunks/oasis/invoices/list.js?id=07d3d3555eb78e813c2d",
+    "/chunks/oasis/invoices.js": "/chunks/oasis/invoices.js?id=e9fae2fa1a4c4d617abc",
+    "/chunks/oasis/invoices/list.js": "/chunks/oasis/invoices/list.js?id=3539c5b93ef27718693c",
     "/chunks/oasis/invoices~chunks/oasis/invoices/list.js": "/chunks/oasis/invoices~chunks/oasis/invoices/list.js?id=045d3dd7ce573cb7ed11",
     "/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=c69c0503d09d1588f14a",
     "/chunks/oasis/platba.js": "/chunks/oasis/platba.js?id=53d9f2a31b1dd5dad85e",
@@ -144,7 +144,7 @@
     "/chunks/files~chunks/shared-files~chunks/shared/file-browser.54fd2076f822088606df.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared/file-browser.54fd2076f822088606df.hot-update.js",
     "/chunks/oasis/invoices.54fd2076f822088606df.hot-update.js": "/chunks/oasis/invoices.54fd2076f822088606df.hot-update.js",
     "/chunks/oasis/invoices/list.54fd2076f822088606df.hot-update.js": "/chunks/oasis/invoices/list.54fd2076f822088606df.hot-update.js",
-    "/chunks/oasis/invoices~chunks/platform~chunks/shared.js": "/chunks/oasis/invoices~chunks/platform~chunks/shared.js?id=9ad184d8e96c7d04941c",
+    "/chunks/oasis/invoices~chunks/platform~chunks/shared.js": "/chunks/oasis/invoices~chunks/platform~chunks/shared.js?id=a53a01abf7a98a9c2d15",
     "/vendors~chunks/files~chunks/oasis/invoices~chunks/platform~chunks/shared~chunks/shared-files~chunks/~9b82b04f.js": "/vendors~chunks/files~chunks/oasis/invoices~chunks/platform~chunks/shared~chunks/shared-files~chunks/~9b82b04f.js?id=548bff41ffa0385b8f01",
     "/vendors~chunks/oasis/invoices~chunks/platform~chunks/shared.js": "/vendors~chunks/oasis/invoices~chunks/platform~chunks/shared.js?id=03d3cf785cbafa4d31f0",
     "/chunks/oasis/invoices.a23d9da8da43103742b3.hot-update.js": "/chunks/oasis/invoices.a23d9da8da43103742b3.hot-update.js",
@@ -508,5 +508,10 @@
     "/chunks/oasis/invoices.bdd28288f6ec48d16509.hot-update.js": "/chunks/oasis/invoices.bdd28288f6ec48d16509.hot-update.js",
     "/chunks/oasis/invoices.f97b94d2d2511af5ebdb.hot-update.js": "/chunks/oasis/invoices.f97b94d2d2511af5ebdb.hot-update.js",
     "/chunks/oasis/invoices.57867d7372f35cea6448.hot-update.js": "/chunks/oasis/invoices.57867d7372f35cea6448.hot-update.js",
-    "/chunks/oasis/invoices.48343b7abe9ced451cc7.hot-update.js": "/chunks/oasis/invoices.48343b7abe9ced451cc7.hot-update.js"
+    "/chunks/oasis/invoices.48343b7abe9ced451cc7.hot-update.js": "/chunks/oasis/invoices.48343b7abe9ced451cc7.hot-update.js",
+    "/chunks/oasis/invoices.4519172bbd7901d9e195.hot-update.js": "/chunks/oasis/invoices.4519172bbd7901d9e195.hot-update.js",
+    "/chunks/oasis/invoices/list.be32b6b52b65889643f5.hot-update.js": "/chunks/oasis/invoices/list.be32b6b52b65889643f5.hot-update.js",
+    "/chunks/oasis/invoices/list.d7d6786df8c9c46beb12.hot-update.js": "/chunks/oasis/invoices/list.d7d6786df8c9c46beb12.hot-update.js",
+    "/chunks/oasis/invoices/list.21d16259a86456f8142e.hot-update.js": "/chunks/oasis/invoices/list.21d16259a86456f8142e.hot-update.js",
+    "/chunks/oasis/invoices~chunks/platform~chunks/shared.409bd2372db7e64b7bf4.hot-update.js": "/chunks/oasis/invoices~chunks/platform~chunks/shared.409bd2372db7e64b7bf4.hot-update.js"
 }
diff --git a/resources/js/Oasis/Invoices/Invoice.vue b/resources/js/Oasis/Invoices/Invoice.vue
index 3a1ce63f..995daa4b 100644
--- a/resources/js/Oasis/Invoices/Invoice.vue
+++ b/resources/js/Oasis/Invoices/Invoice.vue
@@ -18,7 +18,7 @@
 
 			<!--Sidebar navigation-->
 			<ContentSidebar>
-				<ContentGroup title="Invoices" class="navigator menu-list-wrapper vertical">
+				<ContentGroup title="Invoicing" class="navigator menu-list-wrapper vertical">
 					<a @click="goTo('regular-invoice')" :class="{'is-active': $isThisLocation(['regular-invoice']) && $route.name === 'InvoicesList'}" class="menu-list-item link">
 						<div class="icon text-theme">
 							<file-text-icon size="17" />
@@ -35,8 +35,6 @@
 							Advance Invoices
 						</div>
 					</a>
-				</ContentGroup>
-				<ContentGroup title="Others" class="navigator menu-list-wrapper vertical">
 					<a @click="goTo('clients')" :class="{'is-active': $isThisLocation(['clients']) && $route.name === 'InvoicesList'}" class="menu-list-item link">
 						<div class="icon text-theme">
 							<users-icon size="17" />
@@ -45,6 +43,8 @@
 							Clients
 						</div>
 					</a>
+				</ContentGroup>
+				<ContentGroup title="Settings" class="navigator menu-list-wrapper vertical">
 					<router-link :to="{name: 'InvoicesProfile'}" class="menu-list-item link">
 						<div class="icon text-theme">
 							<edit2-icon size="17" />
diff --git a/resources/js/Oasis/Invoices/components/InvoiceContextMenu.vue b/resources/js/Oasis/Invoices/components/InvoiceContextMenu.vue
index 3074ba3e..abb4059d 100644
--- a/resources/js/Oasis/Invoices/components/InvoiceContextMenu.vue
+++ b/resources/js/Oasis/Invoices/components/InvoiceContextMenu.vue
@@ -75,7 +75,9 @@ export default {
     },
     methods: {
 		goToCompany() {
-			this.$router.push({name: 'ClientDetail', params: {id: this.item.id}})
+			this.$router.push({name: 'ClientDetail', params: {id: this.item.client_id}})
+			events.$emit('file-preview:hide')
+			this.isVisible = false
 		},
         downloadItem() {
             if (this.clipboard.length > 1)
diff --git a/resources/js/components/FilesView/FilePreviewMedia.vue b/resources/js/components/FilesView/FilePreviewMedia.vue
index eef25114..189eac08 100644
--- a/resources/js/components/FilesView/FilePreviewMedia.vue
+++ b/resources/js/components/FilesView/FilePreviewMedia.vue
@@ -198,7 +198,7 @@ export default {
     created() {
 
         // Set zoom size
-        this.documentSize = window.innerWidth < 960 ? 100 : 50
+        this.documentSize = window.innerWidth < 960 ? 100 : 70
 
         events.$on('file-preview:next', () => this.next())
         events.$on('file-preview:prev', () => this.prev())