diff --git a/Frontend/patient_manager/lib/Authentication/authCheck.dart b/Frontend/patient_manager/lib/Authentication/authCheck.dart
index 0402da8c..8cedc05e 100644
--- a/Frontend/patient_manager/lib/Authentication/authCheck.dart
+++ b/Frontend/patient_manager/lib/Authentication/authCheck.dart
@@ -12,14 +12,16 @@ class AuthCheck extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return FutureBuilder(
-        future: doesSessionExist(),
-        builder: (context, snapshot) {
-          if (snapshot.data == true) {
-            return const Home();
-          } else {
-            return const SignInOrRegister();
-          }
-        });
+    return Scaffold(
+      body: FutureBuilder(
+          future: doesSessionExist(),
+          builder: (context, snapshot) {
+            if (snapshot.data == true) {
+              return const Home();
+            } else {
+              return const SignInOrRegister();
+            }
+          }),
+    );
   }
 }
diff --git a/Frontend/patient_manager/lib/components/addOrViewPatient.dart b/Frontend/patient_manager/lib/components/addOrViewPatient.dart
index 803235a1..501f5522 100644
--- a/Frontend/patient_manager/lib/components/addOrViewPatient.dart
+++ b/Frontend/patient_manager/lib/components/addOrViewPatient.dart
@@ -55,25 +55,23 @@ class _AddOrViewPatientState extends State<AddOrViewPatient> {
     return FutureBuilder(
       future: fetchPatient(),
       builder: (ctx, snapshot) {
-        if (snapshot.connectionState == ConnectionState.waiting) {
+        if (snapshot.connectionState == ConnectionState.done &&
+            snapshot.hasData) {
+          // Extracting data from snapshot object
+          //final data = snapshot.data as String;
+          return PatientView(
+              arguments: PatientViewArguments(
+            widget.arguments.signedInUser,
+            snapshot.requireData,
+            null,
+            null,
+            widget.arguments.type,
+          ));
+        } else if (snapshot.connectionState == ConnectionState.waiting) {
           return const Mihloadingcircle();
+        } else {
+          return AddPatient(signedInUser: widget.arguments.signedInUser);
         }
-        // Checking if future is resolved
-        else if (snapshot.connectionState == ConnectionState.done) {
-          if (snapshot.hasData) {
-            // Extracting data from snapshot object
-            //final data = snapshot.data as String;
-            return PatientView(
-                arguments: PatientViewArguments(
-              widget.arguments.signedInUser,
-              snapshot.requireData,
-              null,
-              null,
-              widget.arguments.type,
-            ));
-          }
-        }
-        return AddPatient(signedInUser: widget.arguments.signedInUser);
       },
     );
   }
diff --git a/Frontend/patient_manager/lib/pages/register.dart b/Frontend/patient_manager/lib/pages/register.dart
index c0759b9a..d5ef32a8 100644
--- a/Frontend/patient_manager/lib/pages/register.dart
+++ b/Frontend/patient_manager/lib/pages/register.dart
@@ -49,7 +49,7 @@ class _RegisterState extends State<Register> {
       }),
     );
     if (response.statusCode == 201) {
-      Navigator.of(context).popAndPushNamed('/home');
+      Navigator.of(context).pushNamedAndRemoveUntil('/', (route) => false);
       signUpSuccess();
       // setState(() {
       //   successfulSignUp = true;
diff --git a/Frontend/patient_manager/lib/pages/signin.dart b/Frontend/patient_manager/lib/pages/signin.dart
index e80eab62..1fda129b 100644
--- a/Frontend/patient_manager/lib/pages/signin.dart
+++ b/Frontend/patient_manager/lib/pages/signin.dart
@@ -95,7 +95,7 @@ class _SignInState extends State<SignIn> {
     } else {
       await signUserIn();
       if (successfulSignIn) {
-        Navigator.of(context).popAndPushNamed('/home');
+        Navigator.of(context).pushNamedAndRemoveUntil('/', (route) => false);
       }
     }
   }