diff --git a/backend/settings/config.go b/backend/settings/config.go
index 81b6bd0d..df16dd34 100644
--- a/backend/settings/config.go
+++ b/backend/settings/config.go
@@ -50,6 +50,7 @@ func setDefaults() Settings {
 		AdminUsername: "admin",
 		AdminPassword: "admin",
 		Server: Server{
+			EnableThumbnails:   true,
 			EnableExec:         false,
 			IndexingInterval:   5,
 			Port:               8080,
diff --git a/frontend/public/img/icons/android-chrome-192x192.png b/frontend/public/img/icons/android-chrome-192x192.png
deleted file mode 100644
index e9131e42..00000000
Binary files a/frontend/public/img/icons/android-chrome-192x192.png and /dev/null differ
diff --git a/frontend/public/img/icons/android-chrome-512x512.png b/frontend/public/img/icons/android-chrome-512x512.png
deleted file mode 100644
index d4d3f2e2..00000000
Binary files a/frontend/public/img/icons/android-chrome-512x512.png and /dev/null differ
diff --git a/frontend/public/img/icons/apple-touch-icon.png b/frontend/public/img/icons/apple-touch-icon.png
deleted file mode 100644
index 7ea77eb8..00000000
Binary files a/frontend/public/img/icons/apple-touch-icon.png and /dev/null differ
diff --git a/frontend/public/img/icons/favicon-16x16.png b/frontend/public/img/icons/favicon-16x16.png
deleted file mode 100644
index b02a47ff..00000000
Binary files a/frontend/public/img/icons/favicon-16x16.png and /dev/null differ
diff --git a/frontend/public/img/icons/favicon-32x32.png b/frontend/public/img/icons/favicon-32x32.png
index d5672cc1..bb33be2b 100644
Binary files a/frontend/public/img/icons/favicon-32x32.png and b/frontend/public/img/icons/favicon-32x32.png differ
diff --git a/frontend/public/img/icons/favicon.ico b/frontend/public/img/icons/favicon.ico
index 1d6f60cd..d78d8bdb 100644
Binary files a/frontend/public/img/icons/favicon.ico and b/frontend/public/img/icons/favicon.ico differ
diff --git a/frontend/public/img/icons/mstile-144x144.png b/frontend/public/img/icons/mstile-144x144.png
deleted file mode 100644
index 0c2745c0..00000000
Binary files a/frontend/public/img/icons/mstile-144x144.png and /dev/null differ
diff --git a/frontend/public/img/icons/mstile-150x150.png b/frontend/public/img/icons/mstile-150x150.png
index 7130a1e3..bb33be2b 100644
Binary files a/frontend/public/img/icons/mstile-150x150.png and b/frontend/public/img/icons/mstile-150x150.png differ
diff --git a/frontend/public/img/icons/mstile-310x150.png b/frontend/public/img/icons/mstile-310x150.png
deleted file mode 100644
index 6e0dc0a1..00000000
Binary files a/frontend/public/img/icons/mstile-310x150.png and /dev/null differ
diff --git a/frontend/public/img/icons/mstile-310x310.png b/frontend/public/img/icons/mstile-310x310.png
deleted file mode 100644
index 56d4963a..00000000
Binary files a/frontend/public/img/icons/mstile-310x310.png and /dev/null differ
diff --git a/frontend/public/img/icons/mstile-70x70.png b/frontend/public/img/icons/mstile-70x70.png
deleted file mode 100644
index 556d2cd1..00000000
Binary files a/frontend/public/img/icons/mstile-70x70.png and /dev/null differ
diff --git a/frontend/public/themes/dark.css b/frontend/public/themes/dark.css
index b76520b0..42eb58ff 100644
--- a/frontend/public/themes/dark.css
+++ b/frontend/public/themes/dark.css
@@ -33,13 +33,14 @@ header {
 
 #search #input {
   background: var(--surfaceSecondary);
-  border-color: var(--surfacePrimary);
+  border-color: var(--surfaceSecondary);
 }
 #search #input input::placeholder {
   color: var(--textSecondary);
 }
 #search.active #input {
   background: var(--surfacePrimary);
+  border-color: white;
 }
 #search.active input {
   color: var(--textPrimary);
@@ -131,8 +132,8 @@ nav > div {
 .input {
   background: var(--surfaceSecondary);
   color: var(--textPrimary);
-  border: 1px solid rgba(255, 255, 255, 0.05);
 }
+
 .input:hover,
 .input:focus {
   border-color: rgba(255, 255, 255, 0.15);
@@ -215,5 +216,5 @@ nav {
 }
 #result-desktop #result-list {
   background: #2a3137;
-
+  max-height: unset;
 }
\ No newline at end of file
diff --git a/frontend/src/components/Search.vue b/frontend/src/components/Search.vue
index e67c4e86..c3cfe898 100644
--- a/frontend/src/components/Search.vue
+++ b/frontend/src/components/Search.vue
@@ -1,27 +1,12 @@
 <template>
   <div id="search" @click="open" v-bind:class="{ active, ongoing }">
     <div id="input">
-      <button
-        v-if="active"
-        class="action"
-        @click="close"
-        :aria-label="$t('buttons.close')"
-        :title="$t('buttons.close')"
-      >
+      <button v-if="active" class="action" @click="close" :aria-label="$t('buttons.close')" :title="$t('buttons.close')">
         <i class="material-icons">close</i>
       </button>
       <i v-else class="material-icons">search</i>
-      <input
-        class="main-input"
-        type="text"
-        @keyup.exact="keyup"
-        @input="submit"
-        ref="input"
-        :autofocus="active"
-        v-model.trim="value"
-        :aria-label="$t('search.search')"
-        :placeholder="$t('search.search')"
-      />
+      <input class="main-input" type="text" @keyup.exact="keyup" @input="submit" ref="input" :autofocus="active"
+        v-model.trim="value" :aria-label="$t('search.search')" :placeholder="$t('search.search')" />
     </div>
     <div v-if="isMobile && active" id="result" :class="{ hidden: !active }" ref="result">
       <div id="result-list">
@@ -29,12 +14,7 @@
           Search Context: {{ getContext(this.$route.path) }}
         </div>
         <ul v-show="results.length > 0">
-          <li
-            v-for="(s, k) in results"
-            :key="k"
-            @click.stop.prevent="navigateTo(s.url)"
-            style="cursor: pointer"
-          >
+          <li v-for="(s, k) in results" :key="k" @click.stop.prevent="navigateTo(s.url)" style="cursor: pointer">
             <router-link to="#" event="">
               <i v-if="s.dir" class="material-icons folder-icons"> folder </i>
               <i v-else-if="s.audio" class="material-icons audio-icons"> volume_up </i>
@@ -57,26 +37,15 @@
           </div>
         </div>
         <template v-if="isEmpty">
-          <button
-            class="mobile-boxes"
-            v-if="value.length === 0 && !showBoxes"
-            @click="resetSearchFilters()"
-          >
+          <button class="mobile-boxes" v-if="value.length === 0 && !showBoxes" @click="resetSearchFilters()">
             Reset filters
           </button>
           <template v-if="value.length === 0 && showBoxes">
             <div class="boxes">
               <h3>{{ $t("search.types") }}</h3>
               <div>
-                <div
-                  class="mobile-boxes"
-                  tabindex="0"
-                  v-for="(v, k) in boxes"
-                  :key="k"
-                  role="button"
-                  @click="addToTypes('type:' + k)"
-                  :aria-label="v.label"
-                >
+                <div class="mobile-boxes" tabindex="0" v-for="(v, k) in boxes" :key="k" role="button"
+                  @click="addToTypes('type:' + k)" :aria-label="v.label">
                   <i class="material-icons">{{ v.icon }}</i>
                   <p>{{ v.label }}</p>
                 </div>
@@ -121,52 +90,26 @@
             </p>
           </div>
           <template>
-            <ButtonGroup
-              :buttons="folderSelect"
-              @button-clicked="addToTypes"
-              @remove-button-clicked="removeFromTypes"
-              @disableAll="folderSelectClicked()"
-              @enableAll="resetButtonGroups()"
-            />
-            <ButtonGroup
-              :buttons="typeSelect"
-              @button-clicked="addToTypes"
-              @remove-button-clicked="removeFromTypes"
-              :isDisabled="isTypeSelectDisabled"
-            />
+            <ButtonGroup :buttons="folderSelect" @button-clicked="addToTypes" @remove-button-clicked="removeFromTypes"
+              @disableAll="folderSelectClicked()" @enableAll="resetButtonGroups()" />
+            <ButtonGroup :buttons="typeSelect" @button-clicked="addToTypes" @remove-button-clicked="removeFromTypes"
+              :isDisabled="isTypeSelectDisabled" />
             <div class="sizeConstraints">
               <div class="sizeInputWrapper">
                 <p>Smaller Than:</p>
-                <input
-                
-                  class="sizeInput"
-                  v-model="smallerThan"
-                  type="number"
-                  min="0"
-                  placeholder="number"
-                />
+                <input class="sizeInput" v-model="smallerThan" type="number" min="0" placeholder="number" />
                 <p>MB</p>
               </div>
               <div class="sizeInputWrapper">
                 <p>Larger Than:</p>
-                <input
-                  class="sizeInput"
-                  v-model="largerThan"
-                  type="number"
-                  placeholder="number"
-                />
+                <input class="sizeInput" v-model="largerThan" type="number" placeholder="number" />
                 <p>MB</p>
               </div>
             </div>
           </template>
         </template>
         <ul v-show="results.length > 0">
-          <li
-            v-for="(s, k) in results"
-            :key="k"
-            @click.stop.prevent="navigateTo(s.url)"
-            style="cursor: pointer"
-          >
+          <li v-for="(s, k) in results" :key="k" @click.stop.prevent="navigateTo(s.url)" style="cursor: pointer">
             <router-link to="#" event="">
               <i v-if="s.dir" class="material-icons folder-icons"> folder </i>
               <i v-else-if="s.audio" class="material-icons audio-icons"> volume_up </i>
@@ -189,43 +132,56 @@
 .main-input {
   width: 100%;
 }
+
 .searchContext {
   width: 100%;
   padding: 0.5em 1em;
   background: var(--blue);
   color: white;
-  border: 1px solid rgba(0, 0, 0, 0.05);
+  border-left: 1px solid gray;
+  border-right: 1px solid gray;
 }
-#result-desktop #result-list {
+
+#result-desktop>#result-list {
+  max-height: 80vh;
+  width: 35em;
+  overflow: scroll;
+  padding-bottom: 1em;
+  -webkit-transition: width 0.3s ease 0s;
   transition: width 0.3s ease 0s;
-  max-width: 100%;
-  overflow-x: hidden;
-  overflow-y: auto;
-  border-color: gray;
-  width: 30em;
-  padding-top: 0em;
-  border-color: #a7a7a7;
+}
+
+#result-desktop {
+  -webkit-animation: SlideDown 0.5s forwards;
+  animation: SlideDown 0.5s forwards;
+  border-radius: 1m;
   border-width: 1px;
   border-style: solid;
   border-radius: 1em;
+  max-height: 100%;
   border-top: none;
+  border-top-width: initial;
+  border-top-style: none;
+  border-top-color: initial;
   border-top-left-radius: 0px;
   border-top-right-radius: 0px;
-  background: white;
-  max-height: 80vh;
-  left: 50%;
   -webkit-transform: translateX(-50%);
   transform: translateX(-50%);
   -webkit-box-shadow: 0px 2em 50px 10px rgba(0, 0, 0, 0.3);
   box-shadow: 0px 2em 50px 10px rgba(0, 0, 0, 0.3);
+  background-color: lightgray;
+  max-height: 80vh;
+  overflow: hidden;
 }
+
 #search.active #result-desktop ul li a {
   display: flex;
   align-items: center;
   padding: .3em 0;
   margin-right: .3em;
 }
-#result-list.active {
+
+#search #result-list.active {
   width: 65em !important;
   max-width: 85vw !important;
 }
@@ -236,18 +192,22 @@
     transform: translateY(-3em);
     opacity: 0;
   }
+
   100% {
     transform: translateY(0);
     opacity: 1;
   }
 }
+
 /* Search */
 #search {
-  flex-basis: auto;
+  z-index:3;
+  position: fixed;
+  top: .5em;
   min-width: 35em;
-  height: 3em;
-  display: flex;
-  flex-direction: column;
+  left: 50%;
+  -webkit-transform: translateX(-50%);
+  transform: translateX(-50%);
 }
 
 #search #input {
@@ -256,14 +216,11 @@
   height: 100%;
   padding: 0em 0.75em;
   border-style: solid;
-  border-color: #ccc;
   border-radius: 1em;
-  border-style: solid;
-  border-color: #a7a7a7;
+  border-style: unset;
   border-width: 1px;
-  transition: 1s ease all;
   align-items: center;
-  z-index: 3;
+  height: 3em;
 }
 
 #search input {
@@ -283,8 +240,10 @@
 
 /* Hiding scrollbar for IE, Edge and Firefox */
 #result-list {
-  scrollbar-width: none; /* Firefox */
-  -ms-overflow-style: none; /* IE and Edge */
+  scrollbar-width: none;
+  /* Firefox */
+  -ms-overflow-style: none;
+  /* IE and Edge */
 }
 
 .text-container {
@@ -309,6 +268,7 @@
   color: rgba(0, 0, 0, 0.6);
   height: 0;
   transition: 2s ease height, 2s ease padding;
+  transition: 2s ease width, 2s ease padding;
   z-index: 3;
 }
 
@@ -316,7 +276,7 @@ body.rtl #search #result {
   direction: ltr;
 }
 
-#search #result > div > *:first-child {
+#search #result>div>*:first-child {
   margin-top: 0;
 }
 
@@ -326,7 +286,7 @@ body.rtl #search #result {
 }
 
 /* Search Results */
-body.rtl #search #result ul > * {
+body.rtl #search #result ul>* {
   direction: ltr;
   text-align: left;
 }
@@ -352,12 +312,14 @@ body.rtl #search #result ul > * {
 #search.ongoing #renew {
   display: block;
 }
+
 #search.active #input {
-  border-bottom-left-radius: 0px;
-  border-bottom-right-radius: 0px;
+  background-color: lightgray;
+  border-color: black;
+  border-style: solid;
   border-bottom-style: none;
-  border-bottom-left-radius: 0px;
-  border-bottom-right-radius: 0px;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 0;
 }
 
 /* Search Input Placeholder */
@@ -406,10 +368,6 @@ body.rtl #search .boxes h3 {
   font-size: 3.5em;
 }
 
-#result-desktop {
-  animation: SlideDown 0.5s forwards;
-}
-
 .mobile-boxes {
   cursor: pointer;
   overflow: hidden;
@@ -420,6 +378,7 @@ body.rtl #search .boxes h3 {
   border-radius: 1em;
   text-align: center;
 }
+
 /* Hiding scrollbar for Chrome, Safari and Opera */
 .mobile-boxes::-webkit-scrollbar {
   display: none;
@@ -427,9 +386,12 @@ body.rtl #search .boxes h3 {
 
 /* Hiding scrollbar for IE, Edge and Firefox */
 .mobile-boxes {
-  scrollbar-width: none; /* Firefox */
-  -ms-overflow-style: none; /* IE and Edge */
+  scrollbar-width: none;
+  /* Firefox */
+  -ms-overflow-style: none;
+  /* IE and Edge */
 }
+
 .helpText {
   padding: 1em;
 }
@@ -455,17 +417,17 @@ body.rtl #search .boxes h3 {
 
 .sizeInputWrapper {
   border-radius: 1em;
-    margin-left: 0.5em;
-    margin-right: 0.5em;
-    display: -ms-flexbox;
-    display: flex;
-    background-color: rgb(245, 245, 245);
-    padding: 0.25em;
-    height: 3em;
-    -webkit-box-align: center;
-    -ms-flex-align: center;
-    align-items: center;
-    border: 1px solid #ccc
+  margin-left: 0.5em;
+  margin-right: 0.5em;
+  display: -ms-flexbox;
+  display: flex;
+  background-color: rgb(245, 245, 245);
+  padding: 0.25em;
+  height: 3em;
+  -webkit-box-align: center;
+  -ms-flex-align: center;
+  align-items: center;
+  border: 1px solid #ccc
 }
 
 .helpButton {
@@ -545,7 +507,7 @@ export default {
       setTimeout(() => {
         resultList.classList.add("active");
       }, 100);
-      
+
     },
     show(val, old) {
       this.active = val === "search";
diff --git a/frontend/src/components/Sidebar.vue b/frontend/src/components/Sidebar.vue
index 44159b63..b10624a3 100644
--- a/frontend/src/components/Sidebar.vue
+++ b/frontend/src/components/Sidebar.vue
@@ -16,7 +16,7 @@
           <i class="material-icons">note_add</i>
           <span>{{ $t("sidebar.newFile") }}</span>
         </button>
-        <button id="upload-button" @click="upload($event)" class="action" :aria-label="$t('sidebar.upload')" >
+        <button id="upload-button" @click="upload($event)" class="action" >
           <i class="material-icons">file_upload</i>
           <span>Upload file</span>
         </button>
diff --git a/frontend/src/css/base.css b/frontend/src/css/base.css
index 62910375..af882085 100644
--- a/frontend/src/css/base.css
+++ b/frontend/src/css/base.css
@@ -126,8 +126,13 @@ main {
   padding-top: 4em;
   overflow: scroll;
   top: 0;
-  height: 100vh;
+  height: 100%;
   width: 100%;
+  display: flex;
+  flex-direction: column;
+}
+main > div {
+  height: calc(100% - 3em);
 }
 
 .breadcrumbs {
diff --git a/frontend/src/css/header.css b/frontend/src/css/header.css
index 24a07cb6..90d39503 100644
--- a/frontend/src/css/header.css
+++ b/frontend/src/css/header.css
@@ -53,11 +53,6 @@ header .action span {
   display: none;
 }
 
-header>div div {
-  vertical-align: middle;
-  position: relative;
-}
-
 /* Icon Colors */
 .folder-icons {
   color: var(--icon-blue);
diff --git a/frontend/src/css/mobile.css b/frontend/src/css/mobile.css
index a4c03e7b..d592a166 100644
--- a/frontend/src/css/mobile.css
+++ b/frontend/src/css/mobile.css
@@ -54,16 +54,20 @@
   }
   #search {
     min-width: unset;
+    max-width: 60%;
   }
 
   #search.active {
     display: block;
     position: fixed;
     top: 0;
-    left: 0;
+    left: 50%;
     width: 100%;
+    max-width: 100%;
+  }
+  #search #input {
+    transition: 1s ease all;
   }
-
   #search.active #input {
     border-bottom: 3px solid rgba(0, 0, 0, 0.075);
     box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
diff --git a/frontend/src/css/styles.css b/frontend/src/css/styles.css
index 14059978..19be48c2 100644
--- a/frontend/src/css/styles.css
+++ b/frontend/src/css/styles.css
@@ -280,15 +280,11 @@ main .spinner .bounce2 {
 #editor-container {
   display: flex;
   flex-direction: column;
-  background-color: #fafafa;
-  position: fixed;
-  padding-top: 4em;
-  top: 0;
-  left: 0;
+  background-color: none;
   height: 100%;
   width: 100%;
-  z-index: 9999;
   overflow: hidden;
+  position: relative;
 }
 
 #editor-container #editor {
diff --git a/frontend/src/views/Errors.vue b/frontend/src/views/Errors.vue
index 43746105..5d154bcf 100644
--- a/frontend/src/views/Errors.vue
+++ b/frontend/src/views/Errors.vue
@@ -1,7 +1,5 @@
 <template>
   <div>
-    <header-bar v-if="showHeader" showMenu showLogo />
-
     <h2 class="message">
       <i class="material-icons">{{ info.icon }}</i>
       <span>{{ $t(info.message) }}</span>
diff --git a/frontend/src/views/Files.vue b/frontend/src/views/Files.vue
index 9a20f39c..d0b329d1 100644
--- a/frontend/src/views/Files.vue
+++ b/frontend/src/views/Files.vue
@@ -1,7 +1,5 @@
 <template>
   <div>
-    <header-bar v-if="error || req.type == null" showMenu showLogo />
-
     <breadcrumbs base="/files" />
 
     <errors v-if="error" :errorCode="error.status" />
@@ -91,8 +89,12 @@ export default {
     }
     this.$store.commit("updateRequest", {});
   },
+  currentView(newView) {
+    // Commit the new value to the store
+    this.setCurrentValue(this.newValue);
+  },
   methods: {
-    ...mapMutations(["setLoading"]),
+    ...mapMutations(["setLoading","setCurrentView"]),
     async fetchData() {
       // Reset view information.
       this.$store.commit("setReload", false);
diff --git a/frontend/src/views/Layout.vue b/frontend/src/views/Layout.vue
index 81b0e825..d7bcd388 100644
--- a/frontend/src/views/Layout.vue
+++ b/frontend/src/views/Layout.vue
@@ -3,9 +3,8 @@
     <div v-if="progress" class="progress">
       <div v-bind:style="{ width: this.progress + '%' }"></div>
     </div>
-    <editorBar v-if="getCurrentView === 'editor'"></editorBar>
-    <listingBar v-else-if="getCurrentView === 'listing'"></listingBar>
-    <previewBar v-else-if="getCurrentView === 'preview'"></previewBar>
+    <listingBar v-if="currentView === 'listing'"></listingBar>
+    <editorBar v-else-if="currentView === 'editor'"></editorBar>
     <defaultBar v-else></defaultBar>
     <sidebar></sidebar>
     <main>
@@ -17,24 +16,21 @@
 </template>
 
 <script>
-import editorBar from "./files/Editor.vue"
-import defaultBar from "./files/Default.vue"
-import listingBar from"./files/Listing.vue"
-import previewBar from "./files/Preview.vue"
+import editorBar from "./bars/EditorBar.vue"
+import defaultBar from "./bars/Default.vue"
+import listingBar from "./bars/ListingBar.vue"
 import Prompts from "@/components/prompts/Prompts";
 import Action from "@/components/header/Action";
 import { mapState, mapGetters } from "vuex";
 import Sidebar from "@/components/Sidebar.vue";
 import UploadFiles from "../components/prompts/UploadFiles";
 import { enableExec } from "@/utils/constants";
-
 export default {
   name: "layout",
   components: {
     defaultBar,
     editorBar,
     listingBar,
-    previewBar,
     Action,
     Sidebar,
     Prompts,
@@ -49,18 +45,28 @@ export default {
     };
   },
   computed: {
-    ...mapGetters(["isLogged", "progress"]),
-    ...mapState(["req", "user", "currentView"]),
-    
+    ...mapGetters(["isLogged", "progress", "isListing"]),
+    ...mapState(["req", "user", "state"]),
+
     isExecEnabled: () => enableExec,
-    getCurrentView() {
-      return this.currentView;
+    currentView() {
+      if (this.req.type == undefined) {
+        return null;
+      }
+
+      if (this.req.isDir) {
+        return "listing";
+      } else if (
+        this.req.type === "text" ||
+        this.req.type === "textImmutable"
+      ) {
+        return "editor";
+      } else {
+        return "preview";
+      }
     },
   },
   watch: {
-    getCurrentView: function () {
-      console.log(this.currentView)
-    },
     $route: function () {
       this.$store.commit("resetSelected");
       this.$store.commit("multiple", false);
@@ -70,7 +76,7 @@ export default {
   methods: {
     getTitle() {
       let title = "Title"
-      if (this.$route.path.startsWith('/settings/')){
+      if (this.$route.path.startsWith('/settings/')) {
         title = "Settings"
       }
       return title
diff --git a/frontend/src/views/Settings.vue b/frontend/src/views/Settings.vue
index 7dabc1c7..55c03f29 100644
--- a/frontend/src/views/Settings.vue
+++ b/frontend/src/views/Settings.vue
@@ -1,7 +1,5 @@
 <template>
   <div class="dashboard">
-    <header-bar showMenu showLogo />
-
     <div id="nav">
       <div class="wrapper">
         <ul>
@@ -52,15 +50,14 @@
 <script>
 import { mapState } from "vuex";
 
-import HeaderBar from "@/components/header/HeaderBar";
-
 export default {
   name: "settings",
-  components: {
-    HeaderBar,
+  mounted() {
+    // Update the req name property
+    this.$store.commit("updateRequest", { name: "Settings" });
   },
   computed: {
-    ...mapState(["user", "loading"]),
+    ...mapState(["user", "loading","req"]),
   },
 };
 </script>
diff --git a/frontend/src/views/Share.vue b/frontend/src/views/Share.vue
index a739139d..31c7fcc2 100644
--- a/frontend/src/views/Share.vue
+++ b/frontend/src/views/Share.vue
@@ -1,30 +1,5 @@
 <template>
   <div>
-    <header-bar showMenu showLogo>
-      <title />
-
-      <action
-        v-if="selectedCount"
-        icon="file_download"
-        :label="$t('buttons.download')"
-        @action="download"
-        :counter="selectedCount"
-      />
-      <button
-        v-if="isSingleFile()"
-        class="action copy-clipboard"
-        :data-clipboard-text="linkSelected()"
-        :aria-label="$t('buttons.copyDownloadLinkToClipboard')"
-        :title="$t('buttons.copyDownloadLinkToClipboard')"
-      >
-        <i class="material-icons">content_paste</i>
-      </button>
-      <action
-        icon="check_circle"
-        :label="$t('buttons.selectMultiple')"
-        @action="toggleMultipleSelection"
-      />
-    </header-bar>
 
     <breadcrumbs :base="'/share/' + hash" />
 
diff --git a/frontend/src/views/files/Default.vue b/frontend/src/views/bars/Default.vue
similarity index 96%
rename from frontend/src/views/files/Default.vue
rename to frontend/src/views/bars/Default.vue
index 61736c37..e576c942 100644
--- a/frontend/src/views/files/Default.vue
+++ b/frontend/src/views/bars/Default.vue
@@ -1,18 +1,8 @@
 <template>
   <header-bar>
-    <action
-      class="menu-button"
-      icon="menu"
-      :label="$t('buttons.toggleSidebar')"
-      @action="toggleSidebar()"
-    />
-    <search />
-    <action
-      class="menu-button"
-      icon="grid_view"
-      :label="$t('buttons.switchView')"
-      @action="switchView"
-    />
+    <action icon="close" :label="$t('buttons.close')" @action="close()" />
+    <title class="topTitle">{{ req.name }}</title>
+
   </header-bar>
 </template>
 
@@ -29,6 +19,7 @@ import Vue from "vue";
 import { mapState, mapGetters, mapMutations } from "vuex";
 import { users, files as api } from "@/api";
 import { enableExec } from "@/utils/constants";
+import url from "@/utils/url";
 import HeaderBar from "@/components/header/HeaderBar.vue";
 import Action from "@/components/header/Action.vue";
 import * as upload from "@/utils/upload";
@@ -58,6 +49,9 @@ export default {
   computed: {
     ...mapState(["req", "selected", "user", "show", "multiple", "selected", "loading"]),
     ...mapGetters(["selectedCount"]),
+    isSettings() {
+      return this.$route.path.includes("/settings/")
+    },
     nameSorted() {
       return this.req.sorting.by === "name";
     },
@@ -587,7 +581,17 @@ export default {
         },
       });
     },
-
+    close() {
+      if (this.isSettings) { // Use this.isSettings to access the computed property
+        this.$router.push({ path: "/files/" }, () => { });
+        this.$store.commit("closeHovers");
+        return;
+      }
+      this.$store.commit("updateRequest", {});
+      let uri = url.removeLastDir(this.$route.path) + "/";
+      console.log(url)
+      this.$router.push({ path: uri });
+    },
     upload: function () {
       if (
         typeof window.DataTransferItem !== "undefined" &&
diff --git a/frontend/src/views/bars/EditorBar.vue b/frontend/src/views/bars/EditorBar.vue
new file mode 100644
index 00000000..8977c1f3
--- /dev/null
+++ b/frontend/src/views/bars/EditorBar.vue
@@ -0,0 +1,141 @@
+<template>
+  <header-bar>
+    <action icon="close" :label="$t('buttons.close')" @action="close()" />
+    <title class="topTitle">{{ req.name }}</title>
+
+    <action v-if="user.perm.modify" id="save-button" icon="save" :label="$t('buttons.save')"
+      @action="save()" />
+  </header-bar>
+</template>
+
+<style>
+.flexbar {
+  display: flex;
+  flex-direction: block;
+  justify-content: space-between;
+}
+
+.topTitle {
+  display: flex;
+  justify-content: center;
+
+}
+</style>
+
+<script>
+import { mapState } from "vuex";
+import { files as api } from "@/api";
+import { theme } from "@/utils/constants";
+import buttons from "@/utils/buttons";
+import url from "@/utils/url";
+
+import ace from "ace-builds/src-min-noconflict/ace.js";
+import modelist from "ace-builds/src-min-noconflict/ext-modelist.js";
+import "ace-builds/webpack-resolver";
+
+import HeaderBar from "@/components/header/HeaderBar";
+import Action from "@/components/header/Action";
+import Breadcrumbs from "@/components/Breadcrumbs";
+
+export default {
+  name: "editor",
+  components: {
+    HeaderBar,
+    Action,
+    Breadcrumbs,
+  },
+  data: function () {
+    return {};
+  },
+  computed: {
+    ...mapState(["req", "user", "currentView"]),
+    breadcrumbs() {
+      let parts = this.$route.path.split("/");
+
+      if (parts[0] === "") {
+        parts.shift();
+      }
+
+      if (parts[parts.length - 1] === "") {
+        parts.pop();
+      }
+
+      let breadcrumbs = [];
+
+      for (let i = 0; i < parts.length; i++) {
+        breadcrumbs.push({ name: decodeURIComponent(parts[i]) });
+      }
+
+      breadcrumbs.shift();
+
+      if (breadcrumbs.length > 3) {
+        while (breadcrumbs.length !== 4) {
+          breadcrumbs.shift();
+        }
+
+        breadcrumbs[0].name = "...";
+      }
+
+      return breadcrumbs;
+    },
+  },
+  created() {
+    window.addEventListener("keydown", this.keyEvent);
+  },
+  beforeDestroy() {
+    window.removeEventListener("keydown", this.keyEvent);
+    this.editor.destroy();
+  },
+  mounted: function () {
+    const fileContent = this.req.content || "";
+
+    this.editor = ace.edit("editor", {
+      value: fileContent,
+      showPrintMargin: false,
+      readOnly: this.req.type === "textImmutable",
+      theme: "ace/theme/chrome",
+      mode: modelist.getModeForPath(this.req.name).mode,
+      wrap: true,
+    });
+
+    if (theme == "dark") {
+      this.editor.setTheme("ace/theme/twilight");
+    }
+  },
+  methods: {
+    back() {
+      let uri = url.removeLastDir(this.$route.path) + "/";
+      this.$router.push({ path: uri });
+    },
+    keyEvent(event) {
+      if (!event.ctrlKey && !event.metaKey) {
+        return;
+      }
+
+      if (String.fromCharCode(event.which).toLowerCase() !== "s") {
+        return;
+      }
+
+      event.preventDefault();
+      this.save();
+    },
+    async save() {
+      const button = "save";
+      buttons.loading("save");
+
+      try {
+        await api.put(this.$route.path, this.editor.getValue());
+        buttons.success(button);
+      } catch (e) {
+        buttons.done(button);
+        this.$showError(e);
+      }
+    },
+    close() {
+      this.$store.commit("updateRequest", {});
+      let uri = url.removeLastDir(this.$route.path) + "/";
+      this.$router.push({ path: uri });
+    },
+  },
+};
+</script>
\ No newline at end of file
diff --git a/frontend/src/views/bars/ListingBar.vue b/frontend/src/views/bars/ListingBar.vue
new file mode 100644
index 00000000..8c8b0c56
--- /dev/null
+++ b/frontend/src/views/bars/ListingBar.vue
@@ -0,0 +1,630 @@
+<template>
+  <header-bar>
+    <action
+      class="menu-button"
+      icon="menu"
+      :label="$t('buttons.toggleSidebar')"
+      @action="toggleSidebar()"
+    />
+    <search />
+    <action
+      class="menu-button"
+      icon="grid_view"
+      :label="$t('buttons.switchView')"
+      @action="switchView"
+    />
+  </header-bar>
+</template>
+
+<style>
+.flexbar {
+  display:flex;
+  flex-direction:block;
+  justify-content: space-between;
+}
+</style>
+
+<script>
+import Vue from "vue";
+import { mapState, mapGetters, mapMutations } from "vuex";
+import { users, files as api } from "@/api";
+import HeaderBar from "@/components/header/HeaderBar.vue";
+import Action from "@/components/header/Action.vue";
+import url from "@/utils/url";
+import * as upload from "@/utils/upload";
+import css from "@/utils/css";
+import throttle from "lodash.throttle";
+import Search from "@/components/Search.vue";
+
+import Item from "@/components/files/ListingItem.vue";
+
+export default {
+  name: "listing",
+  components: {
+    HeaderBar,
+    Action,
+    Search,
+    Item,
+  },
+  data: function () {
+    return {
+      showLimit: 50,
+      columnWidth: 280,
+      dragCounter: 0,
+      width: window.innerWidth,
+      itemWeight: 0,
+    };
+  },
+  computed: {
+    ...mapState(["req", "selected", "user", "show", "multiple", "selected", "loading"]),
+    ...mapGetters(["selectedCount"]),
+    nameSorted() {
+      return this.req.sorting.by === "name";
+    },
+    sizeSorted() {
+      return this.req.sorting.by === "size";
+    },
+    modifiedSorted() {
+      return this.req.sorting.by === "modified";
+    },
+    ascOrdered() {
+      return this.req.sorting.asc;
+    },
+    items() {
+      const dirs = [];
+      const files = [];
+
+      this.req.items.forEach((item) => {
+        if (item.isDir) {
+          dirs.push(item);
+        } else {
+          files.push(item);
+        }
+      });
+
+      return { dirs, files };
+    },
+    dirs() {
+      return this.items.dirs.slice(0, this.showLimit);
+    },
+    files() {
+      let showLimit = this.showLimit - this.items.dirs.length;
+
+      if (showLimit < 0) showLimit = 0;
+
+      return this.items.files.slice(0, showLimit);
+    },
+    nameIcon() {
+      if (this.nameSorted && !this.ascOrdered) {
+        return "arrow_upward";
+      }
+
+      return "arrow_downward";
+    },
+    sizeIcon() {
+      if (this.sizeSorted && this.ascOrdered) {
+        return "arrow_downward";
+      }
+
+      return "arrow_upward";
+    },
+    modifiedIcon() {
+      if (this.modifiedSorted && this.ascOrdered) {
+        return "arrow_downward";
+      }
+
+      return "arrow_upward";
+    },
+    viewIcon() {
+      const icons = {
+        list: "view_module",
+        mosaic: "grid_view",
+        "mosaic gallery": "view_list",
+      };
+      return icons[this.user.viewMode];
+    },
+    headerButtons() {
+      return {
+        select: this.selectedCount > 0,
+        upload: this.user.perm.create && this.selectedCount > 0,
+        download: this.user.perm.download && this.selectedCount > 0,
+        delete: this.selectedCount > 0 && this.user.perm.delete,
+        rename: this.selectedCount === 1 && this.user.perm.rename,
+        share: this.selectedCount === 1 && this.user.perm.share,
+        move: this.selectedCount > 0 && this.user.perm.rename,
+        copy: this.selectedCount > 0 && this.user.perm.create,
+      };
+    },
+  },
+  watch: {
+    req: function () {
+      // Reset the show value
+      this.showLimit = 50;
+
+      // Ensures that the listing is displayed
+      Vue.nextTick(() => {
+        // How much every listing item affects the window height
+        this.setItemWeight();
+
+        // Fill and fit the window with listing items
+        this.fillWindow(true);
+      });
+    },
+  },
+  mounted: function () {
+    // Check the columns size for the first time.
+    this.colunmsResize();
+
+    // How much every listing item affects the window height
+    this.setItemWeight();
+
+    // Fill and fit the window with listing items
+    this.fillWindow(true);
+
+    // Add the needed event listeners to the window and document.
+    window.addEventListener("keydown", this.keyEvent);
+    window.addEventListener("scroll", this.scrollEvent);
+    window.addEventListener("resize", this.windowsResize);
+
+    if (!this.user.perm.create) return;
+    document.addEventListener("dragover", this.preventDefault);
+    document.addEventListener("dragenter", this.dragEnter);
+    document.addEventListener("dragleave", this.dragLeave);
+    document.addEventListener("drop", this.drop);
+  },
+  beforeDestroy() {
+    // Remove event listeners before destroying this page.
+    window.removeEventListener("keydown", this.keyEvent);
+    window.removeEventListener("scroll", this.scrollEvent);
+    window.removeEventListener("resize", this.windowsResize);
+
+    if (this.user && !this.user.perm.create) return;
+    document.removeEventListener("dragover", this.preventDefault);
+    document.removeEventListener("dragenter", this.dragEnter);
+    document.removeEventListener("dragleave", this.dragLeave);
+    document.removeEventListener("drop", this.drop);
+  },
+  methods: {
+    action: function () {
+      if (this.show) {
+        this.$store.commit("showHover", this.show);
+      }
+
+      this.$emit("action");
+    },
+    toggleSidebar() {
+      if (this.$store.state.show == "sidebar") {
+        this.$store.commit("closeHovers");
+      } else {
+        this.$store.commit("showHover", "sidebar");
+      }
+    },
+    ...mapMutations(["updateUser", "addSelected"]),
+    base64: function (name) {
+      return window.btoa(unescape(encodeURIComponent(name)));
+    },
+    keyEvent(event) {
+      // No prompts are shown
+      if (this.show !== null) {
+        return;
+      }
+
+      // Esc!
+      if (event.keyCode === 27) {
+        // Reset files selection.
+        this.$store.commit("resetSelected");
+      }
+
+      // Del!
+      if (event.keyCode === 46) {
+        if (!this.user.perm.delete || this.selectedCount == 0) return;
+
+        // Show delete prompt.
+        this.$store.commit("showHover", "delete");
+      }
+
+      // F2!
+      if (event.keyCode === 113) {
+        if (!this.user.perm.rename || this.selectedCount !== 1) return;
+
+        // Show rename prompt.
+        this.$store.commit("showHover", "rename");
+      }
+
+      // Ctrl is pressed
+      if (!event.ctrlKey && !event.metaKey) {
+        return;
+      }
+
+      let key = String.fromCharCode(event.which).toLowerCase();
+
+      switch (key) {
+        case "f":
+          event.preventDefault();
+          this.$store.commit("showHover", "search");
+          break;
+        case "c":
+        case "x":
+          this.copyCut(event, key);
+          break;
+        case "v":
+          this.paste(event);
+          break;
+        case "a":
+          event.preventDefault();
+          for (let file of this.items.files) {
+            if (this.$store.state.selected.indexOf(file.index) === -1) {
+              this.addSelected(file.index);
+            }
+          }
+          for (let dir of this.items.dirs) {
+            if (this.$store.state.selected.indexOf(dir.index) === -1) {
+              this.addSelected(dir.index);
+            }
+          }
+          break;
+        case "s":
+          event.preventDefault();
+          document.getElementById("download-button").click();
+          break;
+      }
+    },
+    switchView: async function () {
+      this.$store.commit("closeHovers");
+      const modes = {
+        list: "mosaic",
+        mosaic: "mosaic gallery",
+        "mosaic gallery": "list",
+      };
+
+      const data = {
+        id: this.user.id,
+        viewMode: modes[this.user.viewMode] || "list",
+      };
+      //users.update(data, ["viewMode"]).catch(this.$showError);
+      this.$store.commit("updateUser", data);
+
+      //this.setItemWeight();
+      //this.fillWindow();
+    },
+    preventDefault(event) {
+      // Wrapper around prevent default.
+      event.preventDefault();
+    },
+    copyCut(event, key) {
+      if (event.target.tagName.toLowerCase() === "input") {
+        return;
+      }
+
+      let items = [];
+
+      for (let i of this.selected) {
+        items.push({
+          from: this.req.items[i].url,
+          name: this.req.items[i].name,
+        });
+      }
+
+      if (items.length == 0) {
+        return;
+      }
+
+      this.$store.commit("updateClipboard", {
+        key: key,
+        items: items,
+        path: this.$route.path,
+      });
+    },
+    paste(event) {
+      if (event.target.tagName.toLowerCase() === "input") {
+        return;
+      }
+
+      let items = [];
+
+      for (let item of this.$store.state.clipboard.items) {
+        const from = item.from.endsWith("/") ? item.from.slice(0, -1) : item.from;
+        const to = this.$route.path + encodeURIComponent(item.name);
+        items.push({ from, to, name: item.name });
+      }
+
+      if (items.length === 0) {
+        return;
+      }
+
+      let action = (overwrite, rename) => {
+        api
+          .copy(items, overwrite, rename)
+          .then(() => {
+            this.$store.commit("setReload", true);
+          })
+          .catch(this.$showError);
+      };
+
+      if (this.$store.state.clipboard.key === "x") {
+        action = (overwrite, rename) => {
+          api
+            .move(items, overwrite, rename)
+            .then(() => {
+              this.$store.commit("resetClipboard");
+              this.$store.commit("setReload", true);
+            })
+            .catch(this.$showError);
+        };
+      }
+
+      if (this.$store.state.clipboard.path == this.$route.path) {
+        action(false, true);
+
+        return;
+      }
+
+      let conflict = upload.checkConflict(items, this.req.items);
+
+      let overwrite = false;
+      let rename = false;
+
+      if (conflict) {
+        this.$store.commit("showHover", {
+          prompt: "replace-rename",
+          confirm: (event, option) => {
+            overwrite = option == "overwrite";
+            rename = option == "rename";
+
+            event.preventDefault();
+            this.$store.commit("closeHovers");
+            action(overwrite, rename);
+          },
+        });
+
+        return;
+      }
+
+      action(overwrite, rename);
+    },
+    colunmsResize() {
+      // Update the columns size based on the window width.
+      let columns = Math.floor(
+        document.querySelector("main").offsetWidth / this.columnWidth
+      );
+      let items = css(["#listing.mosaic .item", ".mosaic#listing .item"]);
+      if (columns === 0) columns = 1;
+      items.style.width = `calc(${100 / columns}% - 1em)`;
+    },
+    scrollEvent: throttle(function () {
+      const totalItems = this.req.numDirs + this.req.numFiles;
+
+      // All items are displayed
+      if (this.showLimit >= totalItems) return;
+
+      const currentPos = window.innerHeight + window.scrollY;
+
+      // Trigger at the 75% of the window height
+      const triggerPos = document.body.offsetHeight - window.innerHeight * 0.25;
+
+      if (currentPos > triggerPos) {
+        // Quantity of items needed to fill 2x of the window height
+        const showQuantity = Math.ceil((window.innerHeight * 2) / this.itemWeight);
+
+        // Increase the number of displayed items
+        this.showLimit += showQuantity;
+      }
+    }, 100),
+    dragEnter() {
+      this.dragCounter++;
+
+      // When the user starts dragging an item, put every
+      // file on the listing with 50% opacity.
+      let items = document.getElementsByClassName("item");
+
+      Array.from(items).forEach((file) => {
+        file.style.opacity = 0.5;
+      });
+    },
+    dragLeave() {
+      this.dragCounter--;
+
+      if (this.dragCounter == 0) {
+        this.resetOpacity();
+      }
+    },
+    drop: async function (event) {
+      event.preventDefault();
+      this.dragCounter = 0;
+      this.resetOpacity();
+
+      let dt = event.dataTransfer;
+      let el = event.target;
+
+      if (dt.files.length <= 0) return;
+
+      for (let i = 0; i < 5; i++) {
+        if (el !== null && !el.classList.contains("item")) {
+          el = el.parentElement;
+        }
+      }
+
+      let files = await upload.scanFiles(dt);
+      let items = this.req.items;
+      let path = this.$route.path.endsWith("/")
+        ? this.$route.path
+        : this.$route.path + "/";
+
+      if (el !== null && el.classList.contains("item") && el.dataset.dir === "true") {
+        // Get url from ListingItem instance
+        path = el.__vue__.url;
+
+        try {
+          items = (await api.fetch(path)).items;
+        } catch (error) {
+          this.$showError(error);
+        }
+      }
+
+      let conflict = upload.checkConflict(files, items);
+
+      if (conflict) {
+        this.$store.commit("showHover", {
+          prompt: "replace",
+          confirm: (event) => {
+            event.preventDefault();
+            this.$store.commit("closeHovers");
+            upload.handleFiles(files, path, true);
+          },
+        });
+
+        return;
+      }
+
+      upload.handleFiles(files, path);
+    },
+    uploadInput(event) {
+      this.$store.commit("closeHovers");
+
+      let files = event.currentTarget.files;
+      let folder_upload =
+        files[0].webkitRelativePath !== undefined && files[0].webkitRelativePath !== "";
+
+      if (folder_upload) {
+        for (let i = 0; i < files.length; i++) {
+          let file = files[i];
+          files[i].fullPath = file.webkitRelativePath;
+        }
+      }
+
+      let path = this.$route.path.endsWith("/")
+        ? this.$route.path
+        : this.$route.path + "/";
+      let conflict = upload.checkConflict(files, this.req.items);
+
+      if (conflict) {
+        this.$store.commit("showHover", {
+          prompt: "replace",
+          confirm: (event) => {
+            event.preventDefault();
+            this.$store.commit("closeHovers");
+            upload.handleFiles(files, path, true);
+          },
+        });
+
+        return;
+      }
+
+      upload.handleFiles(files, path);
+    },
+    resetOpacity() {
+      let items = document.getElementsByClassName("item");
+
+      Array.from(items).forEach((file) => {
+        file.style.opacity = 1;
+      });
+    },
+    async sort(by) {
+      let asc = false;
+
+      if (by === "name") {
+        if (this.nameIcon === "arrow_upward") {
+          asc = true;
+        }
+      } else if (by === "size") {
+        if (this.sizeIcon === "arrow_upward") {
+          asc = true;
+        }
+      } else if (by === "modified") {
+        if (this.modifiedIcon === "arrow_upward") {
+          asc = true;
+        }
+      }
+
+      try {
+        await users.update({ id: this.user.id, sorting: { by, asc } }, ["sorting"]);
+      } catch (e) {
+        this.$showError(e);
+      }
+
+      this.$store.commit("setReload", true);
+    },
+    openSearch() {
+      this.$store.commit("showHover", "search");
+    },
+    toggleMultipleSelection() {
+      this.$store.commit("multiple", !this.multiple);
+      this.$store.commit("closeHovers");
+    },
+    windowsResize: throttle(function () {
+      this.colunmsResize();
+      this.width = window.innerWidth;
+
+      // Listing element is not displayed
+      if (this.$refs.listing == null) return;
+
+      // How much every listing item affects the window height
+      this.setItemWeight();
+
+      // Fill but not fit the window
+      this.fillWindow();
+    }, 100),
+    download() {
+      if (this.selectedCount === 1 && !this.req.items[this.selected[0]].isDir) {
+        api.download(null, this.req.items[this.selected[0]].url);
+        return;
+      }
+
+      this.$store.commit("showHover", {
+        prompt: "download",
+        confirm: (format) => {
+          this.$store.commit("closeHovers");
+          let files = [];
+          if (this.selectedCount > 0) {
+            for (let i of this.selected) {
+              files.push(this.req.items[i].url);
+            }
+          } else {
+            files.push(this.$route.path);
+          }
+
+          api.download(format, ...files);
+        },
+      });
+    },
+
+    upload: function () {
+      if (
+        typeof window.DataTransferItem !== "undefined" &&
+        typeof DataTransferItem.prototype.webkitGetAsEntry !== "undefined"
+      ) {
+        this.$store.commit("showHover", "upload");
+      } else {
+        document.getElementById("upload-input").click();
+      }
+    },
+    setItemWeight() {
+      // Listing element is not displayed
+      if (this.$refs.listing == null) return;
+
+      let itemQuantity = this.req.numDirs + this.req.numFiles;
+      if (itemQuantity > this.showLimit) itemQuantity = this.showLimit;
+
+      // How much every listing item affects the window height
+      this.itemWeight = this.$refs.listing.offsetHeight / itemQuantity;
+    },
+    fillWindow(fit = false) {
+      const totalItems = this.req.numDirs + this.req.numFiles;
+
+      // More items are displayed than the total
+      if (this.showLimit >= totalItems && !fit) return;
+
+      const windowHeight = window.innerHeight;
+
+      // Quantity of items needed to fill 2x of the window height
+      const showQuantity = Math.ceil((windowHeight + windowHeight * 2) / this.itemWeight);
+
+      // Less items to display than current
+      if (this.showLimit > showQuantity && !fit) return;
+
+      // Set the number of displayed items
+      this.showLimit = showQuantity > totalItems ? totalItems : showQuantity;
+    },
+  },
+};
+</script>
diff --git a/frontend/src/views/files/Editor.vue b/frontend/src/views/files/Editor.vue
index 3dbabc74..31373ffc 100644
--- a/frontend/src/views/files/Editor.vue
+++ b/frontend/src/views/files/Editor.vue
@@ -1,20 +1,5 @@
 <template>
-  <div id="editor-container">
-    <header-bar>
-      <action icon="close" :label="$t('buttons.close')" @action="close()" />
-      <title>{{ req.name }}</title>
-
-      <action
-        v-if="user.perm.modify"
-        id="save-button"
-        icon="save"
-        :label="$t('buttons.save')"
-        @action="save()"
-      />
-    </header-bar>
-
-    <breadcrumbs base="/files" noLink />
-
+    <div id="editor-container">
     <form id="editor"></form>
   </div>
 </template>
@@ -45,7 +30,7 @@ export default {
     return {};
   },
   computed: {
-    ...mapState(["req", "user"]),
+    ...mapState(["req", "user","currentView"]),
     breadcrumbs() {
       let parts = this.$route.path.split("/");
 
diff --git a/frontend/src/views/files/Preview.vue b/frontend/src/views/files/Preview.vue
index 7a731458..27d8d683 100644
--- a/frontend/src/views/files/Preview.vue
+++ b/frontend/src/views/files/Preview.vue
@@ -4,48 +4,6 @@
     @mousemove="toggleNavigation"
     @touchstart="toggleNavigation"
   >
-    <header-bar>
-      <action icon="close" :label="$t('buttons.close')" @action="close()" />
-      <title>{{ name }}</title>
-      <action
-        :disabled="loading"
-        v-if="isResizeEnabled && req.type === 'image'"
-        :icon="fullSize ? 'photo_size_select_large' : 'hd'"
-        @action="toggleSize"
-      />
-
-      <template #actions>
-        <action
-          :disabled="loading"
-          v-if="user.perm.rename"
-          icon="mode_edit"
-          :label="$t('buttons.rename')"
-          show="rename"
-        />
-        <action
-          :disabled="loading"
-          v-if="user.perm.delete"
-          icon="delete"
-          :label="$t('buttons.delete')"
-          @action="deleteFile"
-          id="delete-button"
-        />
-        <action
-          :disabled="loading"
-          v-if="user.perm.download"
-          icon="file_download"
-          :label="$t('buttons.download')"
-          @action="download"
-        />
-        <action
-          :disabled="loading"
-          icon="info"
-          :label="$t('buttons.info')"
-          show="info"
-        />
-      </template>
-    </header-bar>
-
     <div class="loading delayed" v-if="loading">
       <div class="spinner">
         <div class="bounce1"></div>