diff --git a/files/file.go b/files/file.go
index 569b0be4..2d96d4c5 100644
--- a/files/file.go
+++ b/files/file.go
@@ -322,7 +322,7 @@ func (i *FileInfo) readListing(checker rules.Checker, readHeader bool) error {
 			continue
 		}
 
-		isSymlink := false
+		isSymlink, isInvalidLink := false, false
 		if IsSymlink(f.Mode()) {
 			isSymlink = true
 			// It's a symbolic link. We try to follow it. If it doesn't work,
@@ -330,6 +330,8 @@ func (i *FileInfo) readListing(checker rules.Checker, readHeader bool) error {
 			info, err := i.Fs.Stat(fPath)
 			if err == nil {
 				f = info
+			} else {
+				isInvalidLink = true
 			}
 		}
 
@@ -350,9 +352,13 @@ func (i *FileInfo) readListing(checker rules.Checker, readHeader bool) error {
 		} else {
 			listing.NumFiles++
 
-			err := file.detectType(true, false, readHeader)
-			if err != nil {
-				return err
+			if isInvalidLink {
+				file.Type = "invalid_link"
+			} else {
+				err := file.detectType(true, false, readHeader)
+				if err != nil {
+					return err
+				}
 			}
 		}
 
diff --git a/frontend/src/api/files.js b/frontend/src/api/files.js
index 7494e55b..7b885cfa 100644
--- a/frontend/src/api/files.js
+++ b/frontend/src/api/files.js
@@ -1,4 +1,4 @@
-import { fetchURL, removePrefix } from "./utils";
+import { fetchURL, removePrefix, createURL } from "./utils";
 import { baseURL } from "@/utils/constants";
 import store from "@/store";
 
@@ -7,28 +7,24 @@ export async function fetch(url) {
 
   const res = await fetchURL(`/api/resources${url}`, {});
 
-  if (res.status === 200) {
-    let data = await res.json();
-    data.url = `/files${url}`;
+  let data = await res.json();
+  data.url = `/files${url}`;
 
-    if (data.isDir) {
-      if (!data.url.endsWith("/")) data.url += "/";
-      data.items = data.items.map((item, index) => {
-        item.index = index;
-        item.url = `${data.url}${encodeURIComponent(item.name)}`;
+  if (data.isDir) {
+    if (!data.url.endsWith("/")) data.url += "/";
+    data.items = data.items.map((item, index) => {
+      item.index = index;
+      item.url = `${data.url}${encodeURIComponent(item.name)}`;
 
-        if (item.isDir) {
-          item.url += "/";
-        }
+      if (item.isDir) {
+        item.url += "/";
+      }
 
-        return item;
-      });
-    }
-
-    return data;
-  } else {
-    throw new Error(res.status);
+      return item;
+    });
   }
+
+  return data;
 }
 
 async function resourceAction(url, method, content) {
@@ -42,11 +38,7 @@ async function resourceAction(url, method, content) {
 
   const res = await fetchURL(`/api/resources${url}`, opts);
 
-  if (res.status !== 200) {
-    throw new Error(await res.text());
-  } else {
-    return res;
-  }
+  return res;
 }
 
 export async function remove(url) {
@@ -119,8 +111,8 @@ export async function post(url, content = "", overwrite = false, onupload) {
       }
     };
 
-    request.onerror = (error) => {
-      reject(error);
+    request.onerror = () => {
+      reject(new Error("001 Connection aborted"));
     };
 
     request.send(bufferContent || content);
@@ -154,3 +146,33 @@ export async function checksum(url, algo) {
   const data = await resourceAction(`${url}?checksum=${algo}`, "GET");
   return (await data.json()).checksums[algo];
 }
+
+export function getDownloadURL(file, inline) {
+  const params = {
+    ...(inline && { inline: "true" }),
+  };
+
+  return createURL("api/raw" + file.path, params);
+}
+
+export function getPreviewURL(file, size) {
+  const params = {
+    inline: "true",
+    key: Date.parse(file.modified),
+  };
+
+  return createURL("api/preview/" + size + file.path, params);
+}
+
+export function getSubtitlesURL(file) {
+  const params = {
+    inline: "true",
+  };
+
+  const subtitles = [];
+  for (const sub of file.subtitles) {
+    subtitles.push(createURL("api/raw" + sub, params));
+  }
+
+  return subtitles;
+}
diff --git a/frontend/src/api/pub.js b/frontend/src/api/pub.js
index 58eb1eb6..1511143d 100644
--- a/frontend/src/api/pub.js
+++ b/frontend/src/api/pub.js
@@ -1,35 +1,35 @@
-import { fetchURL, removePrefix } from "./utils";
+import { fetchURL, removePrefix, createURL } from "./utils";
 import { baseURL } from "@/utils/constants";
 
 export async function fetch(url, password = "") {
   url = removePrefix(url);
 
-  const res = await fetchURL(`/api/public/share${url}`, {
-    headers: { "X-SHARE-PASSWORD": encodeURIComponent(password) },
-  });
+  const res = await fetchURL(
+    `/api/public/share${url}`,
+    {
+      headers: { "X-SHARE-PASSWORD": encodeURIComponent(password) },
+    },
+    false
+  );
 
-  if (res.status === 200) {
-    let data = await res.json();
-    data.url = `/share${url}`;
+  let data = await res.json();
+  data.url = `/share${url}`;
 
-    if (data.isDir) {
-      if (!data.url.endsWith("/")) data.url += "/";
-      data.items = data.items.map((item, index) => {
-        item.index = index;
-        item.url = `${data.url}${encodeURIComponent(item.name)}`;
+  if (data.isDir) {
+    if (!data.url.endsWith("/")) data.url += "/";
+    data.items = data.items.map((item, index) => {
+      item.index = index;
+      item.url = `${data.url}${encodeURIComponent(item.name)}`;
 
-        if (item.isDir) {
-          item.url += "/";
-        }
+      if (item.isDir) {
+        item.url += "/";
+      }
 
-        return item;
-      });
-    }
-
-    return data;
-  } else {
-    throw new Error(res.status);
+      return item;
+    });
   }
+
+  return data;
 }
 
 export function download(format, hash, token, ...files) {
@@ -59,3 +59,12 @@ export function download(format, hash, token, ...files) {
 
   window.open(url);
 }
+
+export function getDownloadURL(share, inline = false) {
+  const params = {
+    ...(inline && { inline: "true" }),
+    ...(share.token && { token: share.token }),
+  };
+
+  return createURL("api/public/dl/" + share.hash + share.path, params, false);
+}
diff --git a/frontend/src/api/search.js b/frontend/src/api/search.js
index 08be5c1d..42846880 100644
--- a/frontend/src/api/search.js
+++ b/frontend/src/api/search.js
@@ -11,21 +11,17 @@ export default async function search(base, query) {
 
   let res = await fetchURL(`/api/search${base}?query=${query}`, {});
 
-  if (res.status === 200) {
-    let data = await res.json();
+  let data = await res.json();
 
-    data = data.map((item) => {
-      item.url = `/files${base}` + url.encodePath(item.path);
+  data = data.map((item) => {
+    item.url = `/files${base}` + url.encodePath(item.path);
 
-      if (item.dir) {
-        item.url += "/";
-      }
+    if (item.dir) {
+      item.url += "/";
+    }
 
-      return item;
-    });
+    return item;
+  });
 
-    return data;
-  } else {
-    throw Error(res.status);
-  }
+  return data;
 }
diff --git a/frontend/src/api/settings.js b/frontend/src/api/settings.js
index 8abe1f1e..e03b0db1 100644
--- a/frontend/src/api/settings.js
+++ b/frontend/src/api/settings.js
@@ -5,12 +5,8 @@ export function get() {
 }
 
 export async function update(settings) {
-  const res = await fetchURL(`/api/settings`, {
+  await fetchURL(`/api/settings`, {
     method: "PUT",
     body: JSON.stringify(settings),
   });
-
-  if (res.status !== 200) {
-    throw new Error(res.status);
-  }
 }
diff --git a/frontend/src/api/share.js b/frontend/src/api/share.js
index 54bbc460..1ac4473a 100644
--- a/frontend/src/api/share.js
+++ b/frontend/src/api/share.js
@@ -1,4 +1,4 @@
-import { fetchURL, fetchJSON, removePrefix } from "./utils";
+import { fetchURL, fetchJSON, removePrefix, createURL } from "./utils";
 
 export async function list() {
   return fetchJSON("/api/shares");
@@ -10,13 +10,9 @@ export async function get(url) {
 }
 
 export async function remove(hash) {
-  const res = await fetchURL(`/api/share/${hash}`, {
+  await fetchURL(`/api/share/${hash}`, {
     method: "DELETE",
   });
-
-  if (res.status !== 200) {
-    throw new Error(res.status);
-  }
 }
 
 export async function create(url, password = "", expires = "", unit = "hours") {
@@ -34,3 +30,7 @@ export async function create(url, password = "", expires = "", unit = "hours") {
     body: body,
   });
 }
+
+export function getShareURL(share) {
+  return createURL("share/" + share.hash, {}, false);
+}
diff --git a/frontend/src/api/users.js b/frontend/src/api/users.js
index 7975d66a..105d6cc0 100644
--- a/frontend/src/api/users.js
+++ b/frontend/src/api/users.js
@@ -20,13 +20,11 @@ export async function create(user) {
 
   if (res.status === 201) {
     return res.headers.get("Location");
-  } else {
-    throw new Error(res.status);
   }
 }
 
 export async function update(user, which = ["all"]) {
-  const res = await fetchURL(`/api/users/${user.id}`, {
+  await fetchURL(`/api/users/${user.id}`, {
     method: "PUT",
     body: JSON.stringify({
       what: "user",
@@ -34,18 +32,10 @@ export async function update(user, which = ["all"]) {
       data: user,
     }),
   });
-
-  if (res.status !== 200) {
-    throw new Error(res.status);
-  }
 }
 
 export async function remove(id) {
-  const res = await fetchURL(`/api/users/${id}`, {
+  await fetchURL(`/api/users/${id}`, {
     method: "DELETE",
   });
-
-  if (res.status !== 200) {
-    throw new Error(res.status);
-  }
 }
diff --git a/frontend/src/api/utils.js b/frontend/src/api/utils.js
index 65c6740a..ddddcfa7 100644
--- a/frontend/src/api/utils.js
+++ b/frontend/src/api/utils.js
@@ -1,8 +1,9 @@
 import store from "@/store";
-import { renew } from "@/utils/auth";
+import { renew, logout } from "@/utils/auth";
 import { baseURL } from "@/utils/constants";
+import { encodePath } from "@/utils/url";
 
-export async function fetchURL(url, opts) {
+export async function fetchURL(url, opts, auth = true) {
   opts = opts || {};
   opts.headers = opts.headers || {};
 
@@ -17,14 +18,28 @@ export async function fetchURL(url, opts) {
       },
       ...rest,
     });
-  } catch (error) {
-    return { status: 0 };
+  } catch {
+    const error = new Error("000 No connection");
+    error.status = 0;
+
+    throw error;
   }
 
-  if (res.headers.get("X-Renew-Token") === "true") {
+  if (auth && res.headers.get("X-Renew-Token") === "true") {
     await renew(store.state.jwt);
   }
 
+  if (res.status < 200 || res.status > 299) {
+    const error = new Error(await res.text());
+    error.status = res.status;
+
+    if (auth && res.status == 401) {
+      logout();
+    }
+
+    throw error;
+  }
+
   return res;
 }
 
@@ -45,3 +60,18 @@ export function removePrefix(url) {
   if (url[0] !== "/") url = "/" + url;
   return url;
 }
+
+export function createURL(endpoint, params = {}, auth = true) {
+  const url = new URL(encodePath(endpoint), origin + baseURL);
+
+  const searchParams = {
+    ...(auth && { auth: store.state.jwt }),
+    ...params,
+  };
+
+  for (const key in searchParams) {
+    url.searchParams.set(key, searchParams[key]);
+  }
+
+  return url.toString();
+}
diff --git a/frontend/src/components/files/ListingItem.vue b/frontend/src/components/files/ListingItem.vue
index 351fba1f..b2853fcb 100644
--- a/frontend/src/components/files/ListingItem.vue
+++ b/frontend/src/components/files/ListingItem.vue
@@ -35,7 +35,7 @@
 </template>
 
 <script>
-import { baseURL, enableThumbs } from "@/utils/constants";
+import { enableThumbs } from "@/utils/constants";
 import { mapMutations, mapGetters, mapState } from "vuex";
 import filesize from "filesize";
 import moment from "moment";
@@ -58,6 +58,7 @@ export default {
     "modified",
     "index",
     "readOnly",
+    "path",
   ],
   computed: {
     ...mapState(["user", "selected", "req", "jwt"]),
@@ -83,12 +84,12 @@ export default {
       return true;
     },
     thumbnailUrl() {
-      const path = this.url.replace(/^\/files\//, "");
+      const file = {
+        path: this.path,
+        modified: this.modified,
+      };
 
-      // reload the image when the file is replaced
-      const key = Date.parse(this.modified);
-
-      return `${baseURL}/api/preview/thumb/${path}?k=${key}&inline=true`;
+      return api.getPreviewURL(file, "thumb");
     },
     isThumbsEnabled() {
       return enableThumbs;
@@ -97,7 +98,7 @@ export default {
   methods: {
     ...mapMutations(["addSelected", "removeSelected", "resetSelected"]),
     humanSize: function () {
-      return filesize(this.size);
+      return this.type == "invalid_link" ? "invalid link" : filesize(this.size);
     },
     humanTime: function () {
       if (this.readOnly == undefined && this.user.dateFormat) {
diff --git a/frontend/src/components/prompts/Share.vue b/frontend/src/components/prompts/Share.vue
index eaedafda..210b2f93 100644
--- a/frontend/src/components/prompts/Share.vue
+++ b/frontend/src/components/prompts/Share.vue
@@ -25,7 +25,7 @@
             <td class="small">
               <button
                 class="action copy-clipboard"
-                :data-clipboard-text="buildLink(link.hash)"
+                :data-clipboard-text="buildLink(link)"
                 :aria-label="$t('buttons.copyToClipboard')"
                 :title="$t('buttons.copyToClipboard')"
               >
@@ -118,7 +118,6 @@
 <script>
 import { mapState, mapGetters } from "vuex";
 import { share as api } from "@/api";
-import { baseURL } from "@/utils/constants";
 import moment from "moment";
 import Clipboard from "clipboard";
 
@@ -213,8 +212,8 @@ export default {
     humanTime(time) {
       return moment(time * 1000).fromNow();
     },
-    buildLink(hash) {
-      return `${window.location.origin}${baseURL}/share/${hash}`;
+    buildLink(share) {
+      return api.getShareURL(share);
     },
     sort() {
       this.links = this.links.sort((a, b) => {
diff --git a/frontend/src/components/prompts/UploadFiles.vue b/frontend/src/components/prompts/UploadFiles.vue
index cad8bc0f..37ea3a36 100644
--- a/frontend/src/components/prompts/UploadFiles.vue
+++ b/frontend/src/components/prompts/UploadFiles.vue
@@ -25,6 +25,7 @@
           class="file"
           v-for="file in filesInUpload"
           :key="file.id"
+          :data-dir="file.isDir"
           :data-type="file.type"
           :aria-label="file.name"
         >
diff --git a/frontend/src/css/listing-icons.css b/frontend/src/css/listing-icons.css
index 2de6baab..32c87755 100644
--- a/frontend/src/css/listing-icons.css
+++ b/frontend/src/css/listing-icons.css
@@ -11,6 +11,7 @@
 .file-icons [data-type=pdf] i::before { content: 'description' }
 .file-icons [data-type=text] i::before { content: 'description' }
 .file-icons [data-type=video] i::before { content: 'movie' }
+.file-icons [data-type=invalid_link] i::before { content: 'link_off' }
 
 /* #f90 - Image */
 
@@ -125,6 +126,7 @@
 .file-icons [data-type=audio] i  { color: var(--icon-yellow) }
 .file-icons [data-type=image] i { color: var(--icon-orange) }
 .file-icons [data-type=video] i { color: var(--icon-violet) }
+.file-icons [data-type=invalid_link] i { color: var(--icon-red) }
 
 /* #f00 - Adobe/Oracle */
 
diff --git a/frontend/src/router/index.js b/frontend/src/router/index.js
index 27e2e711..6af06f33 100644
--- a/frontend/src/router/index.js
+++ b/frontend/src/router/index.js
@@ -13,9 +13,25 @@ import Shares from "@/views/settings/Shares";
 import Errors from "@/views/Errors";
 import store from "@/store";
 import { baseURL, name } from "@/utils/constants";
+import i18n from "@/i18n";
 
 Vue.use(Router);
 
+const titles = {
+  Login: "sidebar.login",
+  Share: "buttons.share",
+  Files: "files.files",
+  Settings: "sidebar.settings",
+  ProfileSettings: "settings.profileSettings",
+  Shares: "settings.shareManagement",
+  GlobalSettings: "settings.globalSettings",
+  Users: "settings.users",
+  User: "settings.user",
+  Forbidden: "errors.forbidden",
+  NotFound: "errors.notFound",
+  InternalServerError: "errors.internal",
+};
+
 const router = new Router({
   base: baseURL,
   mode: "history",
@@ -29,7 +45,6 @@ const router = new Router({
           return next({ path: "/files" });
         }
 
-        document.title = "Login - " + name;
         next();
       },
     },
@@ -63,7 +78,7 @@ const router = new Router({
           children: [
             {
               path: "/settings/profile",
-              name: "Profile Settings",
+              name: "ProfileSettings",
               component: ProfileSettings,
             },
             {
@@ -73,7 +88,7 @@ const router = new Router({
             },
             {
               path: "/settings/global",
-              name: "Global Settings",
+              name: "GlobalSettings",
               component: GlobalSettings,
               meta: {
                 requiresAdmin: true,
@@ -108,7 +123,7 @@ const router = new Router({
         },
         {
           path: "/404",
-          name: "Not Found",
+          name: "NotFound",
           component: Errors,
           props: {
             errorCode: 404,
@@ -117,7 +132,7 @@ const router = new Router({
         },
         {
           path: "/500",
-          name: "Internal Server Error",
+          name: "InternalServerError",
           component: Errors,
           props: {
             errorCode: 500,
@@ -140,7 +155,8 @@ const router = new Router({
 });
 
 router.beforeEach((to, from, next) => {
-  document.title = to.name + " - " + name;
+  const title = i18n.t(titles[to.name]);
+  document.title = title + " - " + name;
 
   if (to.matched.some((record) => record.meta.requiresAuth)) {
     if (!store.getters.isLogged) {
diff --git a/frontend/src/store/getters.js b/frontend/src/store/getters.js
index eee94fe2..6bee9bcd 100644
--- a/frontend/src/store/getters.js
+++ b/frontend/src/store/getters.js
@@ -25,15 +25,19 @@ const getters = {
       let upload = state.upload.uploads[index];
       let id = upload.id;
       let type = upload.type;
-      let name = decodeURIComponent(upload.path.replace(/^.*[\\/]/, ""));
-      let progress = state.upload.progress[id];
+      let name = upload.file.name;
       let size = state.upload.sizes[id];
+      let isDir = upload.file.isDir;
+      let progress = isDir
+        ? 100
+        : Math.ceil((state.upload.progress[id] / size) * 100);
 
       files.push({
         id,
         name,
-        progress: Math.ceil((progress / size) * 100),
+        progress,
         type,
+        isDir,
       });
     }
 
diff --git a/frontend/src/utils/constants.js b/frontend/src/utils/constants.js
index 9761339b..200c4e8d 100644
--- a/frontend/src/utils/constants.js
+++ b/frontend/src/utils/constants.js
@@ -14,6 +14,7 @@ const theme = window.FileBrowser.Theme;
 const enableThumbs = window.FileBrowser.EnableThumbs;
 const resizePreview = window.FileBrowser.ResizePreview;
 const enableExec = window.FileBrowser.EnableExec;
+const origin = window.location.origin;
 
 export {
   name,
@@ -31,4 +32,5 @@ export {
   enableThumbs,
   resizePreview,
   enableExec,
+  origin,
 };
diff --git a/frontend/src/utils/upload.js b/frontend/src/utils/upload.js
index e1222024..2184072f 100644
--- a/frontend/src/utils/upload.js
+++ b/frontend/src/utils/upload.js
@@ -70,6 +70,7 @@ export function scanFiles(dt) {
           isDir: true,
           size: 0,
           fullPath: `${directory}${entry.name}`,
+          name: entry.name,
         };
 
         contents.push(dir);
@@ -129,7 +130,7 @@ export function handleFiles(files, base, overwrite = false) {
       path,
       file,
       overwrite,
-      type: detectType(file.type),
+      ...(!file.isDir && { type: detectType(file.type) }),
     };
 
     store.dispatch("upload/upload", item);
diff --git a/frontend/src/utils/url.js b/frontend/src/utils/url.js
index 8346bb03..33d124a2 100644
--- a/frontend/src/utils/url.js
+++ b/frontend/src/utils/url.js
@@ -1,4 +1,4 @@
-function removeLastDir(url) {
+export function removeLastDir(url) {
   var arr = url.split("/");
   if (arr.pop() === "") {
     arr.pop();
@@ -9,7 +9,7 @@ function removeLastDir(url) {
 
 // this code borrow from mozilla
 // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/encodeURIComponent#Examples
-function encodeRFC5987ValueChars(str) {
+export function encodeRFC5987ValueChars(str) {
   return (
     encodeURIComponent(str)
       // Note that although RFC3986 reserves "!", RFC5987 does not,
@@ -22,7 +22,7 @@ function encodeRFC5987ValueChars(str) {
   );
 }
 
-function encodePath(str) {
+export function encodePath(str) {
   return str
     .split("/")
     .map((v) => encodeURIComponent(v))
@@ -30,7 +30,7 @@ function encodePath(str) {
 }
 
 export default {
-  encodeRFC5987ValueChars: encodeRFC5987ValueChars,
-  removeLastDir: removeLastDir,
-  encodePath: encodePath,
+  encodeRFC5987ValueChars,
+  removeLastDir,
+  encodePath,
 };
diff --git a/frontend/src/views/Errors.vue b/frontend/src/views/Errors.vue
index b010906d..43746105 100644
--- a/frontend/src/views/Errors.vue
+++ b/frontend/src/views/Errors.vue
@@ -38,15 +38,8 @@ export default {
   },
   props: ["errorCode", "showHeader"],
   computed: {
-    code() {
-      return this.errorCode === "0" ||
-        this.errorCode === "404" ||
-        this.errorCode === "403"
-        ? parseInt(this.errorCode)
-        : 500;
-    },
     info() {
-      return errors[this.code];
+      return errors[this.errorCode] ? errors[this.errorCode] : errors[500];
     },
   },
 };
diff --git a/frontend/src/views/Files.vue b/frontend/src/views/Files.vue
index 128b8a9b..9a20f39c 100644
--- a/frontend/src/views/Files.vue
+++ b/frontend/src/views/Files.vue
@@ -4,7 +4,7 @@
 
     <breadcrumbs base="/files" />
 
-    <errors v-if="error" :errorCode="error.message" />
+    <errors v-if="error" :errorCode="error.status" />
     <component v-else-if="currentView" :is="currentView"></component>
     <div v-else>
       <h2 class="message delayed">
@@ -28,7 +28,6 @@ import Breadcrumbs from "@/components/Breadcrumbs";
 import Errors from "@/views/Errors";
 import Preview from "@/views/files/Preview";
 import Listing from "@/views/files/Listing";
-import { name } from "@/utils/constants";
 
 function clean(path) {
   return path.endsWith("/") ? path.slice(0, -1) : path;
@@ -52,7 +51,6 @@ export default {
   },
   computed: {
     ...mapState(["req", "reload", "loading", "show"]),
-    name: () => name,
     currentView() {
       if (this.req.type == undefined) {
         return null;
@@ -118,7 +116,7 @@ export default {
         }
 
         this.$store.commit("updateRequest", res);
-        document.title = `${res.name} - ${this.$route.name} - ${this.name}`;
+        document.title = `${res.name} - ${document.title}`;
       } catch (e) {
         this.error = e;
       } finally {
diff --git a/frontend/src/views/Share.vue b/frontend/src/views/Share.vue
index eefc6453..5e9feb2d 100644
--- a/frontend/src/views/Share.vue
+++ b/frontend/src/views/Share.vue
@@ -30,7 +30,7 @@
       </h2>
     </div>
     <div v-else-if="error">
-      <div v-if="error.message === '401'">
+      <div v-if="error.status === 401">
         <div class="card floating" id="password">
           <div v-if="attemptedPasswordLogin" class="share__wrong__password">
             {{ $t("login.wrongCredentials") }}
@@ -60,7 +60,7 @@
           </div>
         </div>
       </div>
-      <errors v-else :errorCode="error.message" />
+      <errors v-else :errorCode="error.status" />
     </div>
     <div v-else>
       <div class="share">
@@ -104,7 +104,7 @@
             </a>
           </div>
           <div class="share__box__element share__box__center">
-            <qrcode-vue :value="fullLink" size="200" level="M"></qrcode-vue>
+            <qrcode-vue :value="link" size="200" level="M"></qrcode-vue>
           </div>
         </div>
         <div
@@ -173,7 +173,6 @@
 <script>
 import { mapState, mapMutations, mapGetters } from "vuex";
 import { pub as api } from "@/api";
-import { baseURL } from "@/utils/constants";
 import filesize from "filesize";
 import moment from "moment";
 
@@ -231,21 +230,10 @@ export default {
       return "insert_drive_file";
     },
     link: function () {
-      let queryArg = "";
-      if (this.token !== "") {
-        queryArg = `?token=${this.token}`;
-      }
-
-      const path = this.$route.path.split("/").splice(2).join("/");
-      return `${baseURL}/api/public/dl/${path}${queryArg}`;
+      return api.getDownloadURL(this.req);
     },
     inlineLink: function () {
-      let url = new URL(this.fullLink);
-      url.searchParams.set("inline", "true");
-      return url.href;
-    },
-    fullLink: function () {
-      return window.location.origin + this.link;
+      return api.getDownloadURL(this.req, true);
     },
     humanSize: function () {
       if (this.req.isDir) {
@@ -287,11 +275,12 @@ export default {
 
       try {
         let file = await api.fetch(url, this.password);
+        file.hash = this.hash;
 
         this.token = file.token || "";
 
         this.updateRequest(file);
-        document.title = `${file.name} - ${this.$route.name}`;
+        document.title = `${file.name} - ${document.title}`;
       } catch (e) {
         this.error = e;
       } finally {
diff --git a/frontend/src/views/files/Listing.vue b/frontend/src/views/files/Listing.vue
index 4286e8dc..bdf4806b 100644
--- a/frontend/src/views/files/Listing.vue
+++ b/frontend/src/views/files/Listing.vue
@@ -209,6 +209,7 @@
             v-bind:modified="item.modified"
             v-bind:type="item.type"
             v-bind:size="item.size"
+            v-bind:path="item.path"
           >
           </item>
         </div>
@@ -225,6 +226,7 @@
             v-bind:modified="item.modified"
             v-bind:type="item.type"
             v-bind:size="item.size"
+            v-bind:path="item.path"
           >
           </item>
         </div>
diff --git a/frontend/src/views/files/Preview.vue b/frontend/src/views/files/Preview.vue
index 4e699dca..d08ac5aa 100644
--- a/frontend/src/views/files/Preview.vue
+++ b/frontend/src/views/files/Preview.vue
@@ -103,7 +103,7 @@
             </a>
             <a
               target="_blank"
-              :href="downloadUrl + '&inline=true'"
+              :href="raw"
               class="button button--flat"
               v-if="!req.isDir"
             >
@@ -145,7 +145,7 @@
 <script>
 import { mapState } from "vuex";
 import { files as api } from "@/api";
-import { baseURL, resizePreview } from "@/utils/constants";
+import { resizePreview } from "@/utils/constants";
 import url from "@/utils/url";
 import throttle from "lodash.throttle";
 import HeaderBar from "@/components/header/HeaderBar";
@@ -186,23 +186,14 @@ export default {
       return this.nextLink !== "";
     },
     downloadUrl() {
-      return `${baseURL}/api/raw${url.encodePath(this.req.path)}?auth=${
-        this.jwt
-      }`;
-    },
-    previewUrl() {
-      // reload the image when the file is replaced
-      const key = Date.parse(this.req.modified);
-
-      if (this.req.type === "image" && !this.fullSize) {
-        return `${baseURL}/api/preview/big${url.encodePath(
-          this.req.path
-        )}?k=${key}`;
-      }
-      return `${baseURL}/api/raw${url.encodePath(this.req.path)}?k=${key}`;
+      return api.getDownloadURL(this.req);
     },
     raw() {
-      return `${this.previewUrl}&inline=true`;
+      if (this.req.type === "image" && !this.fullSize) {
+        return api.getPreviewURL(this.req, "big");
+      }
+
+      return api.getDownloadURL(this.req, true);
     },
     showMore() {
       return this.$store.state.show === "more";
@@ -276,9 +267,7 @@ export default {
       }
 
       if (this.req.subtitles) {
-        this.subtitles = this.req.subtitles.map(
-          (sub) => `${baseURL}/api/raw${sub}?inline=true`
-        );
+        this.subtitles = api.getSubtitlesURL(this.req);
       }
 
       let dirs = this.$route.fullPath.split("/");
@@ -320,15 +309,14 @@ export default {
         return;
       }
     },
-    prefetchUrl: function (item) {
-      const key = Date.parse(item.modified);
-      if (item.type === "image" && !this.fullSize) {
-        return `${baseURL}/api/preview/big${item.path}?k=${key}&inline=true`;
-      } else if (item.type === "image") {
-        return `${baseURL}/api/raw${item.path}?k=${key}&inline=true`;
-      } else {
+    prefetchUrl(item) {
+      if (item.type !== "image") {
         return "";
       }
+
+      return this.fullSize
+        ? api.getDownloadURL(item, true)
+        : api.getPreviewURL(item, "big");
     },
     openMore() {
       this.$store.commit("showHover", "more");
@@ -358,7 +346,7 @@ export default {
       this.$router.push({ path: uri });
     },
     download() {
-      api.download(null, this.$route.path);
+      window.open(this.downloadUrl);
     },
   },
 };
diff --git a/frontend/src/views/settings/Global.vue b/frontend/src/views/settings/Global.vue
index 5adf21eb..7d4e91fc 100644
--- a/frontend/src/views/settings/Global.vue
+++ b/frontend/src/views/settings/Global.vue
@@ -1,5 +1,5 @@
 <template>
-  <errors v-if="error" :errorCode="error.message" />
+  <errors v-if="error" :errorCode="error.status" />
   <div class="row" v-else-if="!loading">
     <div class="column">
       <form class="card" @submit.prevent="save">
diff --git a/frontend/src/views/settings/Shares.vue b/frontend/src/views/settings/Shares.vue
index b052c285..d2d5944b 100644
--- a/frontend/src/views/settings/Shares.vue
+++ b/frontend/src/views/settings/Shares.vue
@@ -1,5 +1,5 @@
 <template>
-  <errors v-if="error" :errorCode="error.message" />
+  <errors v-if="error" :errorCode="error.status" />
   <div class="row" v-else-if="!loading">
     <div class="column">
       <div class="card">
@@ -19,9 +19,7 @@
 
             <tr v-for="link in links" :key="link.hash">
               <td>
-                <a :href="buildLink(link.hash)" target="_blank">{{
-                  link.path
-                }}</a>
+                <a :href="buildLink(link)" target="_blank">{{ link.path }}</a>
               </td>
               <td>
                 <template v-if="link.expire !== 0">{{
@@ -43,7 +41,7 @@
               <td class="small">
                 <button
                   class="action copy-clipboard"
-                  :data-clipboard-text="buildLink(link.hash)"
+                  :data-clipboard-text="buildLink(link)"
                   :aria-label="$t('buttons.copyToClipboard')"
                   :title="$t('buttons.copyToClipboard')"
                 >
@@ -64,7 +62,6 @@
 
 <script>
 import { share as api, users } from "@/api";
-import { baseURL } from "@/utils/constants";
 import { mapState, mapMutations } from "vuex";
 import moment from "moment";
 import Clipboard from "clipboard";
@@ -136,8 +133,8 @@ export default {
     humanTime(time) {
       return moment(time * 1000).fromNow();
     },
-    buildLink(hash) {
-      return `${window.location.origin}${baseURL}/share/${hash}`;
+    buildLink(share) {
+      return api.getShareURL(share);
     },
   },
 };
diff --git a/frontend/src/views/settings/User.vue b/frontend/src/views/settings/User.vue
index 8fe2f9b4..09193e33 100644
--- a/frontend/src/views/settings/User.vue
+++ b/frontend/src/views/settings/User.vue
@@ -1,5 +1,5 @@
 <template>
-  <errors v-if="error" :errorCode="error.message" />
+  <errors v-if="error" :errorCode="error.status" />
   <div class="row" v-else-if="!loading">
     <div class="column">
       <form @submit="save" class="card">
diff --git a/frontend/src/views/settings/Users.vue b/frontend/src/views/settings/Users.vue
index df4eb228..75b52f6d 100644
--- a/frontend/src/views/settings/Users.vue
+++ b/frontend/src/views/settings/Users.vue
@@ -1,5 +1,5 @@
 <template>
-  <errors v-if="error" :errorCode="error.message" />
+  <errors v-if="error" :errorCode="error.status" />
   <div class="row" v-else-if="!loading">
     <div class="column">
       <div class="card">
diff --git a/http/auth.go b/http/auth.go
index c243295f..447af91a 100644
--- a/http/auth.go
+++ b/http/auth.go
@@ -71,7 +71,7 @@ func withUser(fn handleFunc) handleFunc {
 		token, err := request.ParseFromRequest(r, &extractor{}, keyFunc, request.WithClaims(&tk))
 
 		if err != nil || !token.Valid {
-			return http.StatusForbidden, nil
+			return http.StatusUnauthorized, nil
 		}
 
 		expired := !tk.VerifyExpiresAt(time.Now().Add(time.Hour).Unix(), true)
diff --git a/http/http.go b/http/http.go
index 88acea75..0de633b8 100644
--- a/http/http.go
+++ b/http/http.go
@@ -27,7 +27,7 @@ func NewHandler(
 	r := mux.NewRouter()
 	r.Use(func(next http.Handler) http.Handler {
 		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			w.Header().Set("Content-Security-Policy", `default-src 'self'`)
+			w.Header().Set("Content-Security-Policy", `default-src 'self'; style-src 'unsafe-inline';`)
 			next.ServeHTTP(w, r)
 		})
 	})