diff --git a/src/components/commandList.svelte b/src/components/commandList.svelte
index 517a3b8..1246790 100644
--- a/src/components/commandList.svelte
+++ b/src/components/commandList.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+	import { base } from '$app/paths';
 	import { fetchAPI } from '$lib/api';
 	import { typeToName, type DiscordInteraction } from '$lib/constants';
   import { fetchCommands } from '$lib/user';
@@ -73,7 +74,7 @@
 		{#if loading}
 			<tr>
 				<td colspan={headers.length} class="p-4">
-					<img src="/slash.png" alt="loading..." class="animate-spin w-11 h-11 mx-auto" />
+					<img src="{base}/slash.png" alt="loading..." class="animate-spin w-11 h-11 mx-auto" />
 				</td>
 			</tr>
 		{:else if error}
diff --git a/src/components/header.svelte b/src/components/header.svelte
index 9652481..269fd87 100644
--- a/src/components/header.svelte
+++ b/src/components/header.svelte
@@ -11,10 +11,10 @@
     </a>
     <div class="w-full block flex-grow lg:flex lg:items-center lg:w-auto">
         <div class="text-sm lg:flex-grow">
-          <a href="#responsive-header" class="block mt-4 lg:inline-block font-semibold lg:mt-0 text-blurple-200 hover:underline mr-4">
+         <!-- <a href="#responsive-header" class="block mt-4 lg:inline-block font-semibold lg:mt-0 text-blurple-200 hover:underline mr-4">
             Add command
-          </a>
-          <a href="/dashboard" class="block mt-4 lg:inline-block lg:mt-0 font-semibold text-blurple-200 hover:underline mr-4">
+          </a> -->
+          <a href="{base}/dashboard" class="block mt-4 lg:inline-block lg:mt-0 font-semibold text-blurple-200 hover:underline mr-4">
             Dashboard
           </a>
         </div>
diff --git a/src/routes/dashboard/+page.svelte b/src/routes/dashboard/+page.svelte
index 27f166d..cc89bfc 100644
--- a/src/routes/dashboard/+page.svelte
+++ b/src/routes/dashboard/+page.svelte
@@ -5,10 +5,13 @@
 	import CommandList from '$components/commandList.svelte';
 	import { discordIdRegex } from '$lib/constants';
 	import { goto } from '$app/navigation';
+	import {browser} from "$app/environment";
+	import { base } from '$app/paths';
 
 	const appInfo = get(applicationInfo);
+	$: searchParams = browser && $page.url.searchParams
 
-	$: guildId = $page.url.searchParams.get('guildId') || '';
+	$: guildId = searchParams && searchParams.get('guildId') || '';
 	$: basePath =
 		guildId && discordIdRegex.test(guildId)
 			? `/applications/${appInfo.id}/guilds/${guildId}/commands`
@@ -40,7 +43,7 @@
                 You are currently viewing the list for specific guild with id "{guildId}"
                 Click the below button to view the global list
             </p>
-			<a href="/dashboard" class="bg-emerald-500 hover:bg-emerald-600 p-2 rounded-lg"
+			<a href="{base}/dashboard" class="bg-emerald-500 hover:bg-emerald-600 p-2 rounded-lg"
 				>View global commands</a
 			>
 		{:else}
diff --git a/src/routes/login/+page.svelte b/src/routes/login/+page.svelte
index a75c60a..1c66207 100644
--- a/src/routes/login/+page.svelte
+++ b/src/routes/login/+page.svelte
@@ -6,6 +6,7 @@
     import { fetchUser } from '$lib/user';
     import { discordIdRegex } from '$lib/constants';
 	import { getAccessToken } from '$lib/api';
+	import { base } from '$app/paths';
 
     let auth = get(authStore);
 
@@ -34,7 +35,7 @@
                 id
             });
 
-            goto('/dashboard')
+            goto(`${base}/dashboard`)
         }
         catch(err) {
             console.log('Error while verifying', err)
@@ -47,7 +48,7 @@
 
     onMount(() => {
         // if token is present immediately redirect to the dashboard
-        if(auth.accessToken !== '') goto('/dashboard')
+        if(auth.accessToken !== '') goto(`${base}/dashboard`)
     });
 
 </script>
diff --git a/src/routes/logout/+page.svelte b/src/routes/logout/+page.svelte
index abdc2c5..c930499 100644
--- a/src/routes/logout/+page.svelte
+++ b/src/routes/logout/+page.svelte
@@ -3,6 +3,7 @@
 	import { onMount } from 'svelte';
 	import { get } from 'svelte/store';
     import { goto } from '$app/navigation'
+	import { base } from '$app/paths';
 
     let auth = get(authStore);
 
@@ -10,11 +11,11 @@
         authStore.update((p) => ({ ...p, accessToken: '' }))
         applicationInfo.set({ username: '', discriminator: '', id: '' });
         // redirect to login
-        goto('/login');
+        goto(`${base}/login`);
     }
 
     onMount(() => {
-        if(auth.accessToken === '') goto('/login')
+        if(auth.accessToken === '') goto(`${base}/login`)
     });
     
 </script>