diff --git a/src/App.vue b/src/App.vue
index ab419744c..8b8a6656c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -315,7 +315,7 @@
   </v-app>
   <About v-if="showAboutDialog" @update:show-about-dialog="showAboutDialog = $event" />
   <Tutorial :show-tutorial="interfaceStore.isTutorialVisible" />
-  <VideoLibraryModal :open-modal="interfaceStore.isVideoLibraryVisible" />
+  <VideoLibraryModal v-if="interfaceStore.isVideoLibraryVisible" :open-modal="interfaceStore.isVideoLibraryVisible" />
   <VehicleDiscoveryDialog v-model="showDiscoveryDialog" show-auto-search-option />
   <UpdateNotification v-if="isElectron()" />
 </template>
diff --git a/src/components/VideoLibraryModal.vue b/src/components/VideoLibraryModal.vue
index a44575a30..914265d25 100644
--- a/src/components/VideoLibraryModal.vue
+++ b/src/components/VideoLibraryModal.vue
@@ -92,19 +92,18 @@
               <div class="flex flex-col w-full h-full px-4 overflow-auto align-center">
                 <div v-for="video in availableVideos" :key="video.fileName" class="mb-4 video-container">
                   <div class="relative video-wrapper">
-                    <video
-                      :id="`video-library-${video.fileName}`"
-                      class="border-4 border-white rounded-md cursor-pointer border-opacity-[0.1] hover:border-opacity-[0.4] transition duration-75 hover:ease-in"
+                    <div
+                      :id="`video-library-thumbnail-${video.fileName}`"
+                      class="border-4 border-white rounded-md cursor-pointer border-opacity-[0.1] hover:border-opacity-[0.4] transition duration-75 hover:ease-in aspect-video"
                       :class="
                         selectedVideos.find((v) => v.fileName === video.fileName)
                           ? ['border-opacity-[0.4]', 'w-[220px]']
                           : ['border-opacity-[0.1]', 'w-[190px]']
                       "
-                      preload="auto"
-                      :poster="!video.isProcessed ? video.thumbnail : undefined"
+                      :src="video.thumbnail ?? undefined"
                     >
-                      <source :src="video.url" />
-                    </video>
+                      <img v-if="video.thumbnail" :src="video.thumbnail" />
+                    </div>
                     <div
                       v-if="selectedVideos.find((v) => v.fileName === video.fileName) && !isMultipleSelectionMode"
                       class="play-button"
@@ -201,9 +200,16 @@
             <!-- Video Player -->
             <div v-if="availableVideos.length > 0" class="flex flex-col justify-between mt-5 align-center w-[720px]">
               <div>
+                <div v-if="loadingVideoBlob" class="text-center w-full aspect-video flex justify-center items-center">
+                  Loading video...
+                </div>
                 <video
-                  v-if="
-                    !isMultipleSelectionMode && selectedVideos.length === 1 && !isMultipleSelectionMode && !loadingData
+                  v-show="
+                    !isMultipleSelectionMode &&
+                    selectedVideos.length === 1 &&
+                    !isMultipleSelectionMode &&
+                    !loadingData &&
+                    !loadingVideoBlob
                   "
                   id="video-player"
                   ref="videoPlayerRef"
@@ -212,9 +218,7 @@
                   :preload="selectedVideos[0].isProcessed ? 'auto' : 'none'"
                   :poster="selectedVideos[0]?.thumbnail || undefined"
                   class="border-[14px] border-white border-opacity-10 rounded-lg min-h-[382px] aspect-video"
-                >
-                  <source :src="selectedVideos[0]?.url || undefined" />
-                </video>
+                ></video>
                 <v-btn
                   v-if="
                     !loadingData &&
@@ -314,7 +318,7 @@
                 </div>
                 <div class="flex flex-row mt-2">
                   <button
-                    v-for="button in fileActionButtons"
+                    v-for="button in fileActionButtons.filter((b) => b.show)"
                     :key="button.name"
                     class="flex flex-col justify-center ml-6 align-center"
                     :disabled="button.disabled"
@@ -496,17 +500,9 @@ const videoStore = useVideoStore()
 const interfaceStore = useAppInterfaceStore()
 const { showSnackbar } = useSnackbar()
 
-const props = defineProps({
-  openModal: Boolean,
-})
-const emits = defineEmits(['update:openModal'])
-
 const { showDialog, closeDialog } = useInteractionDialog()
 const { width: windowWidth } = useWindowSize()
 
-// Track the blob URLs to revoke them when the modal is closed
-const blobURLs = ref<string[]>([])
-
 /* eslint-disable jsdoc/require-jsdoc  */
 interface CustomHammerInstance {
   destroy(): void
@@ -519,7 +515,7 @@ interface HammerInstances {
 /* eslint-enable jsdoc/require-jsdoc  */
 const availableVideos = ref<VideoLibraryFile[]>([])
 const availableLogFiles = ref<VideoLibraryLogFile[]>([])
-const isVisible = ref(props.openModal)
+const isVisible = ref(true)
 const selectedVideos = ref<VideoLibraryFile[]>([])
 const videoPlayerRef = ref<HTMLVideoElement | null>(null)
 const currentTab = ref('videos')
@@ -546,6 +542,8 @@ const showOnScreenProgress = ref(false)
 const lastSelectedVideo = ref<VideoLibraryFile | null>(null)
 const errorProcessingVideos = ref(false)
 const deleteButtonLoading = ref(false)
+const videoBlobURL = ref<string | null>(null)
+const loadingVideoBlob = ref(false)
 
 const dialogStyle = computed(() => {
   const scale = interfaceStore.isOnSmallScreen ? windowWidth.value / 1100 : 1
@@ -577,7 +575,7 @@ const fileActionButtons = computed(() => [
     size: 28,
     tooltip: 'Download selected videos with logs',
     confirmAction: false,
-    show: true,
+    show: !isElectron(),
     disabled: showOnScreenProgress.value === true || isPreparingDownload.value === true,
     action: () => downloadVideoAndTelemetryFiles(),
   },
@@ -608,10 +606,7 @@ const openVideoFolder = (): void => {
 
 const closeModal = (): void => {
   isVisible.value = false
-  emits('update:openModal', false)
   currentTab.value = 'videos'
-  blobURLs.value.forEach((url) => URL.revokeObjectURL(url))
-  blobURLs.value = []
   deselectAllVideos()
   lastSelectedVideo.value = null
   isMultipleSelectionMode.value = false
@@ -635,9 +630,8 @@ const parseMissionAndDateFromTitle = (title: string): string => {
 const playVideo = (): void => {
   if (selectedVideos.value.length === 1 && !isMultipleSelectionMode.value) {
     const videoPlayer = document.getElementById(`video-player`) as HTMLVideoElement
-    if (videoPlayer) {
-      videoPlayer.play().catch((e: Error) => console.error('Error auto-playing video:', e))
-    }
+    if (!videoPlayer) return
+    videoPlayer.play().catch((e: Error) => console.error('Error auto-playing video:', e))
   }
 }
 
@@ -916,44 +910,17 @@ const fetchVideosAndLogData = async (): Promise<void> => {
   const keys = await videoStore.videoStorage.keys()
   for (const key of keys) {
     if (videoStore.isVideoFilename(key)) {
-      videoFilesOperations.push(
-        (async () => {
-          const videoBlob = await videoStore.videoStorage.getItem(key)
-          let url = ''
-          let isProcessed = true
-          if (videoBlob instanceof Blob) {
-            url = URL.createObjectURL(videoBlob)
-            blobURLs.value.push(url)
-          } else {
-            console.error('Video data is not a Blob:', videoBlob)
-          }
-          const size = (await videoStore.videoStorageFileSize(key)) ?? 0
-          return { fileName: key, size, url, isProcessed }
-        })()
-      )
+      videoFilesOperations.push({ fileName: key, isProcessed: true })
     }
     if (key.endsWith('.ass')) {
-      logFileOperations.push(
-        (async () => {
-          const videoBlob = await videoStore.videoStorage.getItem(key)
-          let url = ''
-          if (videoBlob instanceof Blob) {
-            url = URL.createObjectURL(videoBlob)
-            blobURLs.value.push(url)
-          } else {
-            console.error('Video data is not a Blob:', videoBlob)
-          }
-          const size = (await videoStore.videoStorageFileSize(key)) ?? 0
-          return { fileName: key, url, size }
-        })()
-      )
+      logFileOperations.push({ fileName: key })
     }
   }
 
   // Fetch unprocessed videos
   const unprocessedVideos = await videoStore.unprocessedVideos
   const unprocessedVideoOperations = Object.entries(unprocessedVideos).map(async ([hash, videoInfo]) => {
-    return { ...videoInfo, ...{ hash: hash, url: '', isProcessed: false } }
+    return { ...videoInfo, ...{ hash: hash, isProcessed: false } }
   })
 
   const videos = await Promise.all(videoFilesOperations)
@@ -998,7 +965,6 @@ watch(
 )
 
 watch(isVisible, (newValue) => {
-  emits('update:openModal', newValue)
   if (!newValue) {
     resetProgressBars()
     isMultipleSelectionMode.value = false
@@ -1008,34 +974,46 @@ watch(isVisible, (newValue) => {
   }
 })
 
-watch(
-  () => props.openModal,
-  async (newVal) => {
-    isVisible.value = newVal
-    if (newVal === true) {
-      await fetchVideosAndLogData()
-      showOnScreenProgress.value = false
+const loadVideoBlobIntoPlayer = async (videoFileName: string): Promise<void> => {
+  loadingVideoBlob.value = true
+
+  try {
+    const videoPlayer = document.getElementById(`video-player`) as HTMLVideoElement
+    const videoBlob = await videoStore.videoStorage.getItem(videoFileName)
+
+    if (videoBlob instanceof Blob && videoPlayer) {
+      videoBlobURL.value = URL.createObjectURL(videoBlob)
+      videoPlayer.src = videoBlobURL.value
+      videoPlayer.load()
     }
+  } catch (error) {
+    const msg = 'Error loading video blob into player'
+    showSnackbar({ message: msg, duration: 3000, variant: 'error', closeButton: true })
+  } finally {
+    loadingVideoBlob.value = false
   }
-)
+}
+
+const unloadVideoBlob = (): void => {
+  if (!videoBlobURL.value) return
+  URL.revokeObjectURL(videoBlobURL.value)
+  videoBlobURL.value = null
+}
 
 watch(
   selectedVideos,
-  (newVal) => {
+  async (newVal) => {
     if (newVal.length === 1) {
+      lastSelectedVideo.value = newVal[0]
+      await loadVideoBlobIntoPlayer(newVal[0].fileName)
       if (errorProcessingVideos.value) {
         resetProgressBars()
       }
-      lastSelectedVideo.value = newVal[0]
-      const videoSrc = newVal[0].url
-      const videoPlayer = videoPlayerRef.value
-      if (videoPlayer) {
-        videoPlayer.src = videoSrc
-        videoPlayer.load()
-      }
+    } else {
+      unloadVideoBlob()
     }
   },
-  { immediate: true, deep: true }
+  { deep: true }
 )
 
 // Keep last processed video selected after refresh
@@ -1067,11 +1045,11 @@ watch(
   async () => {
     await nextTick()
     availableVideos.value.forEach((video) => {
-      const videoElement = document.getElementById(`video-library-${video.fileName}`)
-      if (videoElement) {
+      const videoThumbnailElement = document.getElementById(`video-library-thumbnail-${video.fileName}`)
+      if (videoThumbnailElement) {
         hammerInstances.value[video.fileName]?.destroy()
 
-        const hammerManager = new Hammer.Manager(videoElement)
+        const hammerManager = new Hammer.Manager(videoThumbnailElement)
         hammerManager.add(new Hammer.Tap())
         hammerManager.add(new Hammer.Press({ time: 500 }))
 
@@ -1118,20 +1096,21 @@ watch(
 )
 
 onMounted(async () => {
-  loadingData.value = true
   await fetchVideosAndLogData()
+  if (availableVideos.value.length > 0) {
+    await loadVideoBlobIntoPlayer(availableVideos.value[0].fileName)
+  }
+  showOnScreenProgress.value = false
 })
 
 onBeforeUnmount(() => {
   currentTab.value = 'videos'
-  // Revoke each blob URL
-  blobURLs.value.forEach((url) => URL.revokeObjectURL(url))
-  blobURLs.value = []
   // Properly destroy Hammer instances
   Object.values(hammerInstances.value).forEach((instance) => {
     instance.destroy()
   })
   interfaceStore.videoLibraryVisibility = false
+  unloadVideoBlob()
 })
 </script>
 
diff --git a/electron/main.ts b/src/electron/main.ts
similarity index 98%
rename from electron/main.ts
rename to src/electron/main.ts
index bb0571877..9e659e668 100644
--- a/electron/main.ts
+++ b/src/electron/main.ts
@@ -36,7 +36,7 @@ function createWindow(): void {
     y: store.get('windowBounds')?.y ?? screen.getPrimaryDisplay().bounds.y,
   })
 
-  mainWindow.on('close', () => {
+  mainWindow.on('move', () => {
     const windowBounds = mainWindow!.getBounds()
     const { x, y, width, height } = windowBounds
     store.set('windowBounds', { x, y, width, height })
diff --git a/electron/preload.ts b/src/electron/preload.ts
similarity index 100%
rename from electron/preload.ts
rename to src/electron/preload.ts
diff --git a/electron/services/auto-update.ts b/src/electron/services/auto-update.ts
similarity index 100%
rename from electron/services/auto-update.ts
rename to src/electron/services/auto-update.ts
diff --git a/electron/services/config-store.ts b/src/electron/services/config-store.ts
similarity index 100%
rename from electron/services/config-store.ts
rename to src/electron/services/config-store.ts
diff --git a/electron/services/network.ts b/src/electron/services/network.ts
similarity index 95%
rename from electron/services/network.ts
rename to src/electron/services/network.ts
index 4f56dbbf4..e0ae4084f 100644
--- a/electron/services/network.ts
+++ b/src/electron/services/network.ts
@@ -1,7 +1,7 @@
 import { ipcMain } from 'electron'
 import { networkInterfaces } from 'os'
 
-import { NetworkInfo } from '../../src/types/network'
+import { NetworkInfo } from '../../types/network'
 /**
  * Get the network information
  * @returns {NetworkInfo} The network information
diff --git a/electron/services/storage.ts b/src/electron/services/storage.ts
similarity index 100%
rename from electron/services/storage.ts
rename to src/electron/services/storage.ts
diff --git a/src/types/video.ts b/src/types/video.ts
index 5b58ba90d..44bff8a8c 100644
--- a/src/types/video.ts
+++ b/src/types/video.ts
@@ -81,17 +81,11 @@ export interface UnprocessedVideoInfo extends CommonVideoInfo {
 }
 
 export interface VideoLibraryFile extends CommonVideoInfo {
-  size?: number
-  url: string
   hash?: string
   isProcessed: boolean
 }
 
-export interface VideoLibraryLogFile extends CommonVideoInfo {
-  size?: number
-  url?: string
-  hash?: string
-}
+export interface VideoLibraryLogFile extends CommonVideoInfo {}
 
 export interface VideoProgress {
   filename: string
diff --git a/vite.config.ts b/vite.config.ts
index 628b3a513..e32fb6d92 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -18,7 +18,7 @@ const baseConfig = {
     (isElectron || isBuilding) &&
       electron([
         {
-          entry: 'electron/main.ts',
+          entry: 'src/electron/main.ts',
           vite: {
             build: {
               outDir: 'dist/electron',
@@ -34,7 +34,7 @@ const baseConfig = {
           },
         },
         {
-          entry: 'electron/preload.ts',
+          entry: 'src/electron/preload.ts',
           vite: {
             build: {
               outDir: 'dist/electron',