diff --git a/webui/src/App.vue b/webui/src/App.vue
index 5ac04823..0e8961ff 100644
--- a/webui/src/App.vue
+++ b/webui/src/App.vue
@@ -80,7 +80,7 @@ import ModalCreateClient from '@/components/ModalCreateClient.vue';
 import ModalDeleteClient from '@/components/ModalDeleteClient.vue';
 import Header from '@/components/Header.vue';
 
-import API from '@/services/api';
+import api from '@/services/apiInstance';
 import Client from '@/components/Client.vue';
 
 import { useStore } from '@/store/store';
@@ -113,12 +113,10 @@ const latestRelease = ref(null);
 
 const refreshInterval = ref(null);
 
-const api = new API();
-
 const refresh = store.refresh;
 const setTheme = store.setTheme;
 
-watch(prefersDarkScheme.value, () => {
+watch(prefersDarkScheme, () => {
   setTheme(uiTheme.value);
 });
 
diff --git a/webui/src/components/ClientAddress.vue b/webui/src/components/ClientAddress.vue
index 85505603..17d45ecb 100644
--- a/webui/src/components/ClientAddress.vue
+++ b/webui/src/components/ClientAddress.vue
@@ -26,9 +26,7 @@
 <script setup>
 import { ref, nextTick } from 'vue';
 import IconEdit from './icons/IconEdit.vue';
-import API from '@/services/api';
-
-const api = new API();
+import api from '@/services/apiInstance';
 
 const props = defineProps({
   client: {
diff --git a/webui/src/components/ClientAvatar.vue b/webui/src/components/ClientAvatar.vue
index d44fe849..88f4f539 100644
--- a/webui/src/components/ClientAvatar.vue
+++ b/webui/src/components/ClientAvatar.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="h-10 w-10 mr-5 rounded-full bg-gray-50 relative">
+  <div class="h-10 w-10 rounded-full bg-gray-50 relative">
     <IconAvatarDefault class="w-6 m-2 text-gray-300" />
     <img v-if="props.client.avatar" :src="props.client.avatar" class="w-10 rounded-full absolute top-0 left-0" />
 
diff --git a/webui/src/components/ClientControls.vue b/webui/src/components/ClientControls.vue
index 929e162b..88949453 100644
--- a/webui/src/components/ClientControls.vue
+++ b/webui/src/components/ClientControls.vue
@@ -73,8 +73,7 @@ import IconQRCode from '@/components/icons/IconQRCode.vue';
 import IconDownload from '@/components/icons/IconDownload.vue';
 import IconDelete from '@/components/icons/IconDelete.vue';
 
-import API from '@/services/api';
-const api = new API();
+import api from '@/services/apiInstance';
 
 import { useStore } from '@/store/store';
 const store = useStore();
diff --git a/webui/src/components/ClientName.vue b/webui/src/components/ClientName.vue
index 984f2dfe..d3fea4da 100644
--- a/webui/src/components/ClientName.vue
+++ b/webui/src/components/ClientName.vue
@@ -52,9 +52,10 @@
 import { ref, nextTick } from 'vue';
 import { useDateTime } from '../composables/useDateTime';
 import IconEdit from './icons/IconEdit.vue';
-import API from '@/services/api';
 import { useStore } from '@/store/store';
 
+import api from '@/services/apiInstance';
+
 const props = defineProps({
   client: {
     type: Object,
@@ -69,8 +70,6 @@ const { dateTime } = useDateTime();
 const clientEditName = ref(null);
 const clientEditNameId = ref(null);
 
-const api = new API();
-
 const cancelEdit = () => {
   clientEditName.value = null;
   clientEditNameId.value = null;
diff --git a/webui/src/components/UpdateNotification.vue b/webui/src/components/UpdateNotification.vue
index 8e94cfff..a774de08 100644
--- a/webui/src/components/UpdateNotification.vue
+++ b/webui/src/components/UpdateNotification.vue
@@ -26,11 +26,11 @@ import { defineProps } from 'vue';
 
 defineProps({
   latestRelease: {
-    type: Object,
+    type: [String, null],
     required: true,
   },
   currentRelease: {
-    type: String,
+    type: [String, null],
     required: true,
   },
 });
diff --git a/webui/src/services/api.js b/webui/src/services/api.js
index d938e819..e3557bdc 100644
--- a/webui/src/services/api.js
+++ b/webui/src/services/api.js
@@ -1,6 +1,8 @@
 export default class API {
   constructor() {
-    this.SERVER = 'http://localhost:51821'; //! DEV
+    this.isDev = import.meta.env.MODE === 'development';
+
+    this.SERVER = this.isDev ? import.meta.env.VITE_SERVER_URL_DEV : '.';
   }
   async call({ method, path, body }) {
     const res = await fetch(`${this.SERVER}/api${path}`, {
@@ -8,7 +10,7 @@ export default class API {
       headers: {
         'Content-Type': 'application/json',
       },
-      credentials: 'include', //! DEV
+      credentials: this.isDev ? 'include' : 'same-origin', //DEV
       body: body ? JSON.stringify(body) : undefined,
     });
 
diff --git a/webui/src/services/apiInstance.js b/webui/src/services/apiInstance.js
new file mode 100644
index 00000000..570d4665
--- /dev/null
+++ b/webui/src/services/apiInstance.js
@@ -0,0 +1,5 @@
+import API from '@/services/api';
+
+const api = new API();
+
+export default api;
diff --git a/webui/src/store/store.js b/webui/src/store/store.js
index 0332713f..0a855a46 100644
--- a/webui/src/store/store.js
+++ b/webui/src/store/store.js
@@ -1,10 +1,9 @@
-import API from '@/services/api';
 import { ref, computed } from 'vue';
 import sha256 from 'crypto-js/sha256';
 
 import { defineStore } from 'pinia';
 
-const api = new API();
+import api from '@/services/apiInstance';
 
 export const useStore = defineStore('store', () => {
   const authenticated = ref(null);
@@ -111,8 +110,11 @@ export const useStore = defineStore('store', () => {
         }
 
         // Debug
-        // client.transferRx = clientsPersist[client.id].transferRxPrevious + Math.random() * 1000;
-        // client.transferTx = clientsPersist[client.id].transferTxPrevious + Math.random() * 1000;
+        if (api.isDev) {
+          client.transferRx = clientsPersist[client.id].transferRxPrevious + Math.random() * 1000;
+          client.transferTx = clientsPersist[client.id].transferTxPrevious + Math.random() * 1000;
+          client.latestHandshakeAt = new Date('2024-03-20');
+        }
 
         if (updateCharts.value) {
           clientsPersist[client.id].transferRxCurrent =