diff --git a/.DS_Store b/.DS_Store
index 194e7e80..64f782f8 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/Frontend/Dockerfile b/Frontend/Dockerfile
index cfedb2a7..1664c3c1 100644
--- a/Frontend/Dockerfile
+++ b/Frontend/Dockerfile
@@ -6,13 +6,13 @@ FROM debian:latest AS build-env
 
 RUN apt-get update --fix-missing
 
-RUN apt-get install -y curl git wget unzip libgconf-2-4 gdb libstdc++6 libglu1-mesa fonts-droid-fallback
+RUN apt-get install -y curl git wget unzip gdb libstdc++6 libglu1-mesa fonts-droid-fallback
+# RUN apt-get install -y curl git wget unzip libgconf-2-4 gdb libstdc++6 libglu1-mesa fonts-droid-fallback
 RUN apt-get install python3 -y
-# RUN apt-get update --fix-missing
-# RUN apt-get install python3-Jinja2
+
 # download Flutter SDK from Flutter Github repo
-RUN git clone -b stable https://github.com/flutter/flutter.git /usr/local/flutter
-#RUN git clone https://github.com/flutter/flutter.git /usr/local/flutter
+RUN git clone -b flutter-3.32-candidate.0 https://github.com/flutter/flutter.git /usr/local/flutter
+# RUN git clone -b stable https://github.com/flutter/flutter.git /usr/local/flutter
 
 # Set flutter environment path
 ENV PATH="/usr/local/flutter/bin:/usr/local/flutter/bin/cache/dart-sdk/bin:${PATH}"
@@ -21,17 +21,13 @@ ENV PATH="/usr/local/flutter/bin:/usr/local/flutter/bin/cache/dart-sdk/bin:${PAT
 RUN flutter doctor -v
 
 # Enable flutter web
-RUN flutter channel stable
-# RUN flutter upgrade
-#RUN flutter pub add web:^0.5.0
+RUN flutter channel flutter-3.32-candidate.0
+# RUN flutter channel stable
 RUN flutter config --enable-web
 
 # Copy files to container and build
 RUN mkdir /app/
 COPY . /app/
-# COPY ./server/MIH_web_server.py /app/build/web/
-# VOLUME ["/app"]
-
 
 WORKDIR /app
 # RUN flutter upgrade
diff --git a/Frontend/macos/Runner.xcodeproj/project.pbxproj b/Frontend/macos/Runner.xcodeproj/project.pbxproj
index b56da1e0..fdf9f49d 100644
--- a/Frontend/macos/Runner.xcodeproj/project.pbxproj
+++ b/Frontend/macos/Runner.xcodeproj/project.pbxproj
@@ -227,7 +227,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0920;
-				LastUpgradeCheck = 1430;
+				LastUpgradeCheck = 1510;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					331C80D4294CF70F00263BE5 = {
diff --git a/Frontend/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/Frontend/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
index 435ece6f..2a240cb9 100644
--- a/Frontend/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
+++ b/Frontend/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1430"
+   LastUpgradeVersion = "1510"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -59,6 +59,7 @@
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
+      enableGPUValidationMode = "1"
       allowLocationSimulation = "YES">
       <BuildableProductRunnable
          runnableDebuggingMode = "0">
diff --git a/Frontend/macos/Runner/AppDelegate.swift b/Frontend/macos/Runner/AppDelegate.swift
index d53ef643..b3c17614 100644
--- a/Frontend/macos/Runner/AppDelegate.swift
+++ b/Frontend/macos/Runner/AppDelegate.swift
@@ -1,9 +1,13 @@
 import Cocoa
 import FlutterMacOS
 
-@NSApplicationMain
+@main
 class AppDelegate: FlutterAppDelegate {
   override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool {
     return true
   }
+
+  override func applicationSupportsSecureRestorableState(_ app: NSApplication) -> Bool {
+    return true
+  }
 }