diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index ce1d71ea..e2151f41 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -9,7 +9,7 @@
     "/chunks/app-appearance.js": "/chunks/app-appearance.js?id=b99a5c881b7f15a7e8c5",
     "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~605f4c49.js": "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~605f4c49.js?id=9e50edacd8630aa6fc22",
     "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~8cc7d96f.js": "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~8cc7d96f.js?id=b6dbd27dc777d0878f4b",
-    "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~b9e5655a.js": "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~b9e5655a.js?id=d2dd97078c9919b69378",
+    "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~b9e5655a.js": "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~b9e5655a.js?id=d066e2c40f4c0ca68bf1",
     "/chunks/app-billings.js": "/chunks/app-billings.js?id=aac5bd51067578358164",
     "/chunks/app-email.js": "/chunks/app-email.js?id=9d1631b19f6492b8cae4",
     "/chunks/app-index.js": "/chunks/app-index.js?id=ec7605e0fcf922be3dbc",
@@ -28,9 +28,9 @@
     "/chunks/database.js": "/chunks/database.js?id=ce57f3e69798319aab7b",
     "/chunks/dynamic-page.js": "/chunks/dynamic-page.js?id=f7ff36abf37571173944",
     "/chunks/environment-setup.js": "/chunks/environment-setup.js?id=48efd0b887fbc804ac90",
-    "/chunks/files.js": "/chunks/files.js?id=2a3e5515b8cba5885197",
+    "/chunks/files.js": "/chunks/files.js?id=6a283c2c9f8a02500bc6",
     "/chunks/files~chunks/settings-subscription~chunks/shared-files~chunks/shared-page~chunks/user-subscription.js": "/chunks/files~chunks/settings-subscription~chunks/shared-files~chunks/shared-page~chunks/user-subscription.js?id=b646ec02fb9d6a497e74",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.js": "/chunks/files~chunks/shared-files~chunks/shared-page.js?id=2f33773e1fb3c1c811dc",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.js": "/chunks/files~chunks/shared-files~chunks/shared-page.js?id=65783284368898ab6b71",
     "/chunks/files~chunks/shared-page.js": "/chunks/files~chunks/shared-page.js?id=47ade53389e84dd64310",
     "/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=d5e39543eeb619cb5513",
     "/chunks/installation-disclaimer.js": "/chunks/installation-disclaimer.js?id=f037ea11689d01ea489e",
@@ -210,5 +210,12 @@
     "/chunks/files~chunks/shared-files~chunks/shared-page.47cb70949df53edbce71.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.47cb70949df53edbce71.hot-update.js",
     "/chunks/files~chunks/shared-files~chunks/shared-page.836821a23e3b0270888f.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.836821a23e3b0270888f.hot-update.js",
     "/chunks/files~chunks/shared-files~chunks/shared-page.446a6fd3f68551eff10c.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.446a6fd3f68551eff10c.hot-update.js",
-    "/js/main.57b2d1e0b90efc2add93.hot-update.js": "/js/main.57b2d1e0b90efc2add93.hot-update.js"
+    "/js/main.57b2d1e0b90efc2add93.hot-update.js": "/js/main.57b2d1e0b90efc2add93.hot-update.js",
+    "/js/main.d7f8c27ad88c9a1d066f.hot-update.js": "/js/main.d7f8c27ad88c9a1d066f.hot-update.js",
+    "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~b9e5655a.d7f8c27ad88c9a1d066f.hot-update.js": "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~b9e5655a.d7f8c27ad88c9a1d066f.hot-update.js",
+    "/chunks/files.d7f8c27ad88c9a1d066f.hot-update.js": "/chunks/files.d7f8c27ad88c9a1d066f.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.d7f8c27ad88c9a1d066f.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.d7f8c27ad88c9a1d066f.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.00fdcb21480e3bd7e611.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.00fdcb21480e3bd7e611.hot-update.js",
+    "/js/main.078a3435bfeb9b4aa0dc.hot-update.js": "/js/main.078a3435bfeb9b4aa0dc.hot-update.js",
+    "/js/main.66ee8b9efc1e41065c68.hot-update.js": "/js/main.66ee8b9efc1e41065c68.hot-update.js"
 }
diff --git a/resources/js/components/FilesView/ContextMenu.vue b/resources/js/components/FilesView/ContextMenu.vue
index fa6af952..c8d13f9a 100644
--- a/resources/js/components/FilesView/ContextMenu.vue
+++ b/resources/js/components/FilesView/ContextMenu.vue
@@ -1,6 +1,7 @@
 <template>
     <div :style="{ top: positionY + 'px', left: positionX + 'px' }" @click="closeAndResetContextMenu" class="contextmenu" v-show="isVisible || showFromPreview" ref="contextmenu" :class="{ 'filePreviewFixed' : showFromPreview}">
-        <!-- ContextMenu for File Preview -->
+
+        <!-- File Preview -->
         <div class="menu-options" id="menu-list" v-if="showFromPreview">
 
             <OptionGroup class="menu-option-group">
@@ -20,7 +21,7 @@
 
         </div>
 
-        <!--ContextMenu for trash location-->
+        <!-- Trash location-->
         <div v-if="$isThisLocation(['trash', 'trash-root']) && $checkPermission('master') && !showFromPreview" id="menu-list" class="menu-options">
 
             <!-- Single options -->
@@ -48,7 +49,7 @@
 
         </div>
 
-        <!--ContextMenu for Base location with MASTER permission-->
+        <!-- Shared location with MASTER permission-->
         <div v-if="$isThisLocation(['shared']) && $checkPermission('master') && !showFromPreview" id="menu-list" class="menu-options">
 
             <!-- Single options -->
@@ -94,8 +95,8 @@
                    
                     
 
-        <!--ContextMenu for Base location with MASTER permission-->
-        <div v-if="$isThisLocation(['base', 'participant_uploads', 'latest']) &&$checkPermission('master') && !showFromPreview" id="menu-list" class="menu-options">
+        <!-- Base location with MASTER permission-->
+        <div v-if="$isThisLocation(['base', 'participant_uploads', 'latest']) && $checkPermission('master') && !showFromPreview" id="menu-list" class="menu-options">
             
             <!-- Single options -->
             <OptionGroup v-if="!$isThisLocation(['participant_uploads', 'latest']) && multiSelectContextMenu">
@@ -145,7 +146,7 @@
 
         </div>
 
-        <!--ContextMenu for Base location with EDITOR permission-->
+        <!-- Base & Public location with EDITOR permission-->
         <div v-if="$isThisLocation(['base', 'public']) && $checkPermission('editor') && !showFromPreview " id="menu-list" class="menu-options">
 
             <!-- Single options -->
@@ -180,7 +181,7 @@
 
         </div>
 
-        <!--ContextMenu for Base location with VISITOR permission-->
+        <!-- Base & Public location with VISITOR permission-->
         <div v-if="$isThisLocation(['base', 'public']) && $checkPermission('visitor') && !showFromPreview" id="menu-list" class="menu-options">
 
             <!-- Single options -->
@@ -298,7 +299,7 @@ export default {
             // Check if folder is in favourites and then add/remove from favourites
             if (
                 this.favourites &&
-                !this.favourites.find((el) => el.unique_id == this.item.unique_id)
+                !this.favourites.find(el => el.unique_id == this.item.unique_id)
             ) {
                 // Add to favourite folder that is not selected
                 if (!this.fileInfoDetail.includes(this.item)) {
@@ -328,7 +329,6 @@ export default {
             this.$store.dispatch('fileInfoToggle', true)
         },
         deleteItem() {
-            // Dispatch remove item
             // If is context menu open on non selected item delete this single item
             if (!this.fileInfoDetail.includes(this.item)) {
                 this.$store.dispatch('deleteItem', this.item)
diff --git a/resources/js/components/FilesView/ProgressBar.vue b/resources/js/components/FilesView/ProgressBar.vue
index 48838e58..c4b08e0d 100644
--- a/resources/js/components/FilesView/ProgressBar.vue
+++ b/resources/js/components/FilesView/ProgressBar.vue
@@ -19,7 +19,7 @@ export default {
 		width: 100%;
 		height: 5px;
 		background: $light_background;
-		margin-top: 5px;
+		margin-top: 6px;
 		border-radius: 10px;
 
 		span {
diff --git a/resources/js/store/modules/userAuth.js b/resources/js/store/modules/userAuth.js
index 7cb14c7b..4b9ea5b5 100644
--- a/resources/js/store/modules/userAuth.js
+++ b/resources/js/store/modules/userAuth.js
@@ -2,6 +2,7 @@ import axios from 'axios'
 import {events} from '@/bus'
 import i18n from '@/i18n/index.js'
 import router from '@/router'
+import Vue from 'vue'
 
 const defaultState = {
     authorized: undefined,
@@ -53,13 +54,14 @@ const actions = {
         let items = [folder]
 
         // If dont coming single folder get folders to add to favourites from fileInfoDetail
-        if(!folder){
+        if(!folder)
             items = context.getters.fileInfoDetail
-        }        
 
         items.forEach((data) => {
             if(data.type === 'folder' ) {
+
                 if(context.getters.user.relationships.favourites.data.attributes.folders.find(folder => folder.unique_id === data.unique_id)) return
+
                 addFavourites.push({
                     'unique_id': data.unique_id
                 })
@@ -88,28 +90,20 @@ const actions = {
                 folders: addFavourites
             })
             .catch(() => {
-                // Show error message
-                events.$emit('alert:open', {
-                    title: i18n.t('popup_error.title'),
-                    message: i18n.t('popup_error.message'),
-                })
+                Vue.prototype.$isSomethingWrong()
             })
     },
-    removeFromFavourites: (context, folder) => {
+    removeFromFavourites: ({commit, getters, dispatch}, folder) => {
 
         // Remove from storage
-        context.commit('REMOVE_ITEM_FROM_FAVOURITES', folder)
+        commit('REMOVE_ITEM_FROM_FAVOURITES', folder)
 
         axios
-            .post(context.getters.api + '/folders/favourites/' + folder.unique_id, {
+            .post(getters.api + '/folders/favourites/' + folder.unique_id, {
                 _method: 'delete'
             })
             .catch(() => {
-                // Show error message
-                events.$emit('alert:open', {
-                    title: i18n.t('popup_error.title'),
-                    message: i18n.t('popup_error.message'),
-                })
+                Vue.prototype.$isSomethingWrong()
             })
     },
 }
diff --git a/resources/js/views/FilePages/Files.vue b/resources/js/views/FilePages/Files.vue
index 8ac51c89..adaa4961 100644
--- a/resources/js/views/FilePages/Files.vue
+++ b/resources/js/views/FilePages/Files.vue
@@ -55,7 +55,7 @@
                             {{ $t('sidebar.favourites_empty') }}
                         </span>
 
-                        <a @click.stop="openFolder(folder)" class="menu-list-item" :class="{'is-current': (folder && currentFolder) && (currentFolder.unique_id === folder.unique_id)}" v-for="folder in favourites" :key="folder.unique_id">
+                        <a @click.stop="openFolder(folder)" class="menu-list-item" :class="{'is-current': (folder && currentFolder) && (currentFolder.unique_id === folder.unique_id)}" v-for="(folder, i) in favourites" :key="i">
                             <div>
                                 <folder-icon size="17" class="folder-icon"></folder-icon>
                                 <span class="label">{{ folder.name }}</span>