diff --git a/src/lib/common/shared/TimeRangePicker.svelte b/src/lib/common/shared/TimeRangePicker.svelte
index 2e5b0bed..14cf3b73 100644
--- a/src/lib/common/shared/TimeRangePicker.svelte
+++ b/src/lib/common/shared/TimeRangePicker.svelte
@@ -330,7 +330,7 @@
 >
 	<button
 		type="button"
-		class="form-control text-start d-flex align-items-center justify-content-between"
+		class="form-control text-start d-flex align-items-center justify-content-between clickable"
 		on:click={() => {
 			showDatePicker = !showDatePicker;
 			if (showDatePicker) {
@@ -344,9 +344,10 @@
 				}
 			}
 		}}
-		style="cursor: pointer;"
 	>
-		<span>{timeRangeDisplayText || 'Select time range'}</span>
+		<span style="overflow: hidden; text-overflow: ellipsis; white-space: nowrap;">
+			{timeRangeDisplayText || 'Select time range'}
+		</span>
 		<i class="bx bx-chevron-down"></i>
 	</button>
 	{#if showDatePicker}
diff --git a/src/lib/helpers/http.js b/src/lib/helpers/http.js
index 5ff75d80..4c4c255d 100644
--- a/src/lib/helpers/http.js
+++ b/src/lib/helpers/http.js
@@ -12,7 +12,7 @@ const retryQueue = {
     isRefreshingToken: false,
 
     /** @type {number} */
-    timeout: 20,
+    timeout: 200,
 
     /** @type {number} */
     maxRenewTokenCount: 30,
diff --git a/src/lib/helpers/store.js b/src/lib/helpers/store.js
index 352dbc0c..66037e5c 100644
--- a/src/lib/helpers/store.js
+++ b/src/lib/helpers/store.js
@@ -1,5 +1,5 @@
 // @ts-nocheck
-import { writable } from 'svelte/store';
+import { writable, get } from 'svelte/store';
 import { browser } from '$app/environment';
 
 const userKey = "user";
@@ -42,17 +42,18 @@ export const userStore = writable({ id: "", full_name: "", expires: 0, token: nu
  */
 export function getUserStore() {
     if (browser) {
-        // Access localStorage only if in the browser context
+        const storeValue = get(userStore);
+        if (storeValue?.token) {
+            return storeValue;
+        }
+
         let json = sessionStorage.getItem(userKey);
         if (json) {
             return JSON.parse(json);
-        } else {
-            return userStore;
         }
-    } else {
-        // Return a default value for SSR
-        return userStore;
     }
+
+    return get(userStore);
 };