diff --git a/Frontend/patient_manager/lib/components/homeTile.dart b/Frontend/patient_manager/lib/components/homeTile.dart
index 29c5b002..c1bc0ddc 100644
--- a/Frontend/patient_manager/lib/components/homeTile.dart
+++ b/Frontend/patient_manager/lib/components/homeTile.dart
@@ -41,62 +41,62 @@ class _HomeTileState extends State<HomeTile> {
     super.initState();
   }
 
-  Widget displayTile() {
-    return FittedBox(
-      child: Column(
-        mainAxisSize: MainAxisSize.min,
-        mainAxisAlignment: MainAxisAlignment.end,
-        children: [
-          GestureDetector(
-            onTap: widget.onTap,
-            onTapDown: (_) {
-              setState(() {
-                mainC = MzanziInnovationHub.of(context)!.theme.primaryColor();
-                secondC =
-                    MzanziInnovationHub.of(context)!.theme.secondaryColor();
-              });
-            },
-            onTapUp: (_) {
-              setState(() {
-                mainC = MzanziInnovationHub.of(context)!.theme.secondaryColor();
-                secondC = MzanziInnovationHub.of(context)!.theme.primaryColor();
-              });
-            },
-            child: Container(
-              padding: const EdgeInsets.all(3.0),
-              decoration: BoxDecoration(
-                color: mainC,
-                borderRadius: BorderRadius.circular(10.0),
-                //border: Border.all(color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), width: 1.0),
-              ),
-              child: Icon(
-                widget.tileIcon,
-                color: secondC,
-              ),
-            ),
-          ),
-          const SizedBox(height: 1),
-          Row(
-            children: [
-              Flexible(
-                child: Text(
-                  widget.tileName,
-                  textAlign: TextAlign.center,
-                  softWrap: true,
-                  overflow: TextOverflow.visible,
-                  style: TextStyle(
-                    color: mainC,
-                    fontSize: 5.0,
-                    fontWeight: FontWeight.bold,
-                  ),
-                ),
-              ),
-            ],
-          )
-        ],
-      ),
-    );
-  }
+  // Widget displayTile() {
+  //   return FittedBox(
+  //     child: Column(
+  //       mainAxisSize: MainAxisSize.min,
+  //       mainAxisAlignment: MainAxisAlignment.end,
+  //       children: [
+  //         GestureDetector(
+  //           onTap: widget.onTap,
+  //           onTapDown: (_) {
+  //             setState(() {
+  //               mainC = MzanziInnovationHub.of(context)!.theme.primaryColor();
+  //               secondC =
+  //                   MzanziInnovationHub.of(context)!.theme.secondaryColor();
+  //             });
+  //           },
+  //           onTapUp: (_) {
+  //             setState(() {
+  //               mainC = MzanziInnovationHub.of(context)!.theme.secondaryColor();
+  //               secondC = MzanziInnovationHub.of(context)!.theme.primaryColor();
+  //             });
+  //           },
+  //           child: Container(
+  //             padding: const EdgeInsets.all(3.0),
+  //             decoration: BoxDecoration(
+  //               color: mainC,
+  //               borderRadius: BorderRadius.circular(10.0),
+  //               //border: Border.all(color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), width: 1.0),
+  //             ),
+  //             child: Icon(
+  //               widget.tileIcon,
+  //               color: secondC,
+  //             ),
+  //           ),
+  //         ),
+  //         const SizedBox(height: 1),
+  //         Row(
+  //           children: [
+  //             Flexible(
+  //               child: Text(
+  //                 widget.tileName,
+  //                 textAlign: TextAlign.center,
+  //                 softWrap: true,
+  //                 overflow: TextOverflow.visible,
+  //                 style: TextStyle(
+  //                   color: mainC,
+  //                   fontSize: 5.0,
+  //                   fontWeight: FontWeight.bold,
+  //                 ),
+  //               ),
+  //             ),
+  //           ],
+  //         )
+  //       ],
+  //     ),
+  //   );
+  // }
 
   @override
   Widget build(BuildContext context) {
@@ -107,31 +107,19 @@ class _HomeTileState extends State<HomeTile> {
           mainAxisSize: MainAxisSize.max,
           mainAxisAlignment: MainAxisAlignment.end,
           children: [
-            InkWell(
-              onTap: widget.onTap,
-              // onTapDown: (_) {
-              //   setState(() {
-              //     mainC = MzanziInnovationHub.of(context)!.theme.primaryColor();
-              //     secondC =
-              //         MzanziInnovationHub.of(context)!.theme.secondaryColor();
-              //   });
-              // },
-              // onTapUp: (_) {
-              //   setState(() {
-              //     mainC = MzanziInnovationHub.of(context)!.theme.secondaryColor();
-              //     secondC = MzanziInnovationHub.of(context)!.theme.primaryColor();
-              //   });
-              // },
-              child: Ink(
-                padding: const EdgeInsets.all(3.0),
-                decoration: BoxDecoration(
-                  color: mainC,
-                  borderRadius: BorderRadius.circular(10.0),
-                  //border: Border.all(color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), width: 1.0),
-                ),
-                child: Icon(
-                  widget.tileIcon,
-                  color: secondC,
+            Material(
+              color: mainC,
+              borderRadius: BorderRadius.circular(10),
+              child: InkWell(
+                onTap: widget.onTap,
+                borderRadius: BorderRadius.circular(10),
+                //highlightColor: secondC,
+                child: Ink(
+                  padding: const EdgeInsets.all(3.0),
+                  child: Icon(
+                    widget.tileIcon,
+                    color: secondC,
+                  ),
                 ),
               ),
             ),
@@ -149,46 +137,5 @@ class _HomeTileState extends State<HomeTile> {
         ),
       ),
     );
-    // child: Card(
-    //   color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
-    //   elevation: 20,
-    //   child: Column(
-    //     //mainAxisSize: MainAxisSize.min,
-    //     children: [
-    //       Expanded(
-    //         child: ListTile(
-    //             leading: Icon(
-    //               widget.tileIcon,
-    //               color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
-    //             ),
-    //             title: Text(
-    //               widget.tileName,
-    //               style: TextStyle(
-    //                 fontWeight: FontWeight.bold,
-    //                 color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
-    //               ),
-    //             ),
-    //             subtitle: Text(
-    //               widget.tileDescription,
-    //               style: TextStyle(color: MzanziInnovationHub.of(context)!.theme.primaryColor()),
-    //             )),
-    //       ),
-    //       Expanded(
-    //         child: Row(
-    //           mainAxisAlignment: MainAxisAlignment.end,
-    //           children: [
-    //             Padding(
-    //               padding: const EdgeInsets.symmetric(horizontal: 10),
-    //               child: Icon(
-    //                 Icons.arrow_forward,
-    //                 color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
-    //               ),
-    //             ),
-    //           ],
-    //         ),
-    //       )
-    //     ],
-    //   ),
-    // ),
   }
 }
diff --git a/Frontend/patient_manager/lib/components/homeTileGrid.dart b/Frontend/patient_manager/lib/components/homeTileGrid.dart
index 58cc1115..65389a29 100644
--- a/Frontend/patient_manager/lib/components/homeTileGrid.dart
+++ b/Frontend/patient_manager/lib/components/homeTileGrid.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:google_nav_bar/google_nav_bar.dart';
 import 'package:patient_manager/components/homeTile.dart';
 import 'package:patient_manager/components/mihAppBar.dart';
 import 'package:patient_manager/components/mihAppDrawer.dart';
@@ -42,7 +43,12 @@ class _HomeTileGridState extends State<HomeTileGrid> {
       tileList.add(HomeTile(
         onTap: () {
           Navigator.of(context)
-              .popAndPushNamed('/profile', arguments: widget.signedInUser);
+              .pushNamed('/profile', arguments: widget.signedInUser);
+          // Navigator.of(context).pushNamedAndRemoveUntil(
+          //   '/profile',
+          //   (route) => false,
+          //   arguments: widget.signedInUser,
+          // );
         },
         tileName: "Setup Profie",
         tileIcon: Icons.perm_identity,
@@ -59,6 +65,11 @@ class _HomeTileGridState extends State<HomeTileGrid> {
           '/business/add',
           arguments: widget.signedInUser,
         );
+        // Navigator.of(context).pushNamedAndRemoveUntil(
+        //   '/business/add',
+        //   (route) => false,
+        //   arguments: widget.signedInUser,
+        // );
       },
       tileName: "Setup Business",
       tileIcon: Icons.add_business_outlined,
@@ -70,9 +81,20 @@ class _HomeTileGridState extends State<HomeTileGrid> {
   void setAppsPersonal(List<HomeTile> tileList) {
     tileList.add(HomeTile(
       onTap: () {
-        Navigator.of(context).popAndPushNamed('/patient-profile',
+        Navigator.of(context).pushNamed('/patient-profile',
             arguments: PatientViewArguments(
                 widget.signedInUser, null, null, null, "personal"));
+        // Navigator.of(context).pushNamedAndRemoveUntil(
+        //   '/patient-profile',
+        //   (route) => false,
+        //   arguments: PatientViewArguments(
+        //     widget.signedInUser,
+        //     null,
+        //     null,
+        //     null,
+        //     "personal",
+        //   ),
+        // );
       },
       tileName: "Patient Profile",
       tileIcon: Icons.medication,
@@ -81,10 +103,15 @@ class _HomeTileGridState extends State<HomeTileGrid> {
     ));
     tileList.add(HomeTile(
       onTap: () {
-        Navigator.of(context).popAndPushNamed(
+        Navigator.of(context).pushNamed(
           '/patient-access-review',
           arguments: widget.signedInUser,
         );
+        // Navigator.of(context).pushNamedAndRemoveUntil(
+        //   '/patient-access-review',
+        //   (route) => false,
+        //   arguments: widget.signedInUser,
+        // );
       },
       tileName: "Access Review",
       tileIcon: Icons.check_box_outlined,
@@ -97,7 +124,7 @@ class _HomeTileGridState extends State<HomeTileGrid> {
     if (widget.businessUser!.access == "Full") {
       tileList.add(HomeTile(
         onTap: () {
-          Navigator.of(context).popAndPushNamed(
+          Navigator.of(context).pushNamed(
             '/business-profile',
             arguments: BusinessArguments(
               widget.signedInUser,
@@ -105,6 +132,15 @@ class _HomeTileGridState extends State<HomeTileGrid> {
               widget.business,
             ),
           );
+          // Navigator.of(context).pushNamedAndRemoveUntil(
+          //   '/business-profile',
+          //   (route) => false,
+          //   arguments: BusinessArguments(
+          //     widget.signedInUser,
+          //     widget.businessUser,
+          //     widget.business,
+          //   ),
+          // );
         },
         tileName: "Business Profile",
         tileIcon: Icons.business,
@@ -115,7 +151,7 @@ class _HomeTileGridState extends State<HomeTileGrid> {
     if (widget.business!.type == "Doctors Office") {
       tileList.add(HomeTile(
         onTap: () {
-          Navigator.of(context).popAndPushNamed(
+          Navigator.of(context).pushNamed(
             '/patient-manager',
             arguments: BusinessArguments(
               widget.signedInUser,
@@ -123,6 +159,15 @@ class _HomeTileGridState extends State<HomeTileGrid> {
               widget.business,
             ),
           );
+          // Navigator.of(context).pushNamedAndRemoveUntil(
+          //   '/patient-manager',
+          //   (route) => false,
+          //   arguments: BusinessArguments(
+          //     widget.signedInUser,
+          //     widget.businessUser,
+          //     widget.business,
+          //   ),
+          // );
         },
         tileName: "Manage Patient",
         tileIcon: Icons.medication,
@@ -150,10 +195,15 @@ class _HomeTileGridState extends State<HomeTileGrid> {
       ));
       tileList.add(HomeTile(
         onTap: () {
-          Navigator.of(context).popAndPushNamed(
+          Navigator.of(context).pushNamed(
             '/business/add',
             arguments: widget.signedInUser,
           );
+          // Navigator.of(context).pushNamedAndRemoveUntil(
+          //   '/business/add',
+          //   (route) => false,
+          //   arguments: widget.signedInUser,
+          // );
         },
         tileName: "Setup Bus - Dev",
         tileIcon: Icons.add_business_outlined,
@@ -162,8 +212,13 @@ class _HomeTileGridState extends State<HomeTileGrid> {
       ));
       tileList.add(HomeTile(
         onTap: () {
-          Navigator.of(context).popAndPushNamed('/patient-manager/add',
+          Navigator.of(context).pushNamed('/patient-manager/add',
               arguments: widget.signedInUser);
+          // Navigator.of(context).pushNamedAndRemoveUntil(
+          //   '/patient-manager/add',
+          //   (route) => false,
+          //   arguments: widget.signedInUser,
+          // );
         },
         tileName: "Add Pat - Dev",
         tileIcon: Icons.add_circle_outline,
@@ -172,8 +227,13 @@ class _HomeTileGridState extends State<HomeTileGrid> {
       ));
       tileList.add(HomeTile(
         onTap: () {
-          Navigator.of(context)
-              .popAndPushNamed('/profile', arguments: widget.signedInUser);
+          // Navigator.of(context)
+          //     .popAndPushNamed('/profile', arguments: widget.signedInUser);
+          Navigator.of(context).pushNamedAndRemoveUntil(
+            '/profile',
+            (route) => false,
+            arguments: widget.signedInUser,
+          );
         },
         tileName: "Upd Prof - Dev",
         tileIcon: Icons.perm_identity,
@@ -305,103 +365,120 @@ class _HomeTileGridState extends State<HomeTileGrid> {
 
   @override
   Widget build(BuildContext context) {
+    final Size size = MediaQuery.sizeOf(context);
+    final double width = size.width;
+    //final double height = size.height;
     return Scaffold(
       appBar: const MIHAppBar(barTitle: "Mzansi Innovation\nHub"),
       drawer: MIHAppDrawer(
         signedInUser: widget.signedInUser,
       ),
-      body: Column(
-        children: [
-          Padding(
-            padding: const EdgeInsets.only(top: 10.0, right: 15.0),
-            child: Row(
-              crossAxisAlignment: CrossAxisAlignment.end,
-              mainAxisAlignment: MainAxisAlignment.end,
-              children: [
-                IconButton(
-                  onPressed: () {
-                    if (!businessUserSwitch) {
-                      setState(() {
-                        businessUserSwitch = true;
-                        _selectedIndex = 1;
-                      });
-                    } else {
-                      setState(() {
-                        businessUserSwitch = false;
-                        _selectedIndex = 0;
-                      });
-                    }
-                  },
-                  icon: const Icon(
-                    Icons.swap_horizontal_circle_outlined,
-                    size: 35,
-                  ),
-                ),
-              ],
-            ),
-          ),
-          Text(
-            getHeading(_selectedIndex),
-            textAlign: TextAlign.center,
-            style: TextStyle(
-              fontWeight: FontWeight.bold,
-              fontSize: 35.0,
-              color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
-            ),
-          ),
-          const SizedBox(
-            height: 20,
-          ),
-          Expanded(
-            child: GridView.builder(
-              itemCount: pbswitch[_selectedIndex].length,
-              gridDelegate: const SliverGridDelegateWithMaxCrossAxisExtent(
-                  maxCrossAxisExtent: 200),
-              itemBuilder: (context, index) {
-                return pbswitch[_selectedIndex][index];
-              },
-            ),
-          ),
-        ],
+      body:
+          // Column(
+          //   children: [
+          // Padding(
+          //   padding: const EdgeInsets.only(top: 10.0, right: 15.0),
+          //   child: Row(
+          //     crossAxisAlignment: CrossAxisAlignment.end,
+          //     mainAxisAlignment: MainAxisAlignment.end,
+          //     children: [
+          //       IconButton(
+          //         onPressed: () {
+          //           if (!businessUserSwitch) {
+          //             setState(() {
+          //               businessUserSwitch = true;
+          //               _selectedIndex = 1;
+          //             });
+          //           } else {
+          //             setState(() {
+          //               businessUserSwitch = false;
+          //               _selectedIndex = 0;
+          //             });
+          //           }
+          //         },
+          //         icon: const Icon(
+          //           Icons.swap_horizontal_circle_outlined,
+          //           size: 35,
+          //         ),
+          //       ),
+          //     ],
+          //   ),
+          // ),
+          // const SizedBox(
+          //   height: 20,
+          // ),
+          // Text(
+          //   getHeading(_selectedIndex),
+          //   textAlign: TextAlign.center,
+          //   style: TextStyle(
+          //     fontWeight: FontWeight.bold,
+          //     fontSize: 35.0,
+          //     color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+          //   ),
+          // ),
+          // const SizedBox(
+          //   height: 20,
+          // ),
+          //Expanded(
+          //child:
+
+          GridView.builder(
+        padding: EdgeInsets.only(
+          left: width / 7,
+          right: width / 7,
+          //bottom: height / 5,
+          top: 20,
+        ),
+        // physics: ,
+        // shrinkWrap: true,
+        itemCount: pbswitch[_selectedIndex].length,
+        gridDelegate: const SliverGridDelegateWithMaxCrossAxisExtent(
+            maxCrossAxisExtent: 200),
+        itemBuilder: (context, index) {
+          return pbswitch[_selectedIndex][index];
+        },
       ),
 
-      // bottomNavigationBar: Visibility(
-      //   visible: isBusinessUser(widget.signedInUser),
-      //   child: Padding(
-      //     padding: const EdgeInsets.all(15.0),
-      //     child: GNav(
-      //       //hoverColor: Colors.lightBlueAccent,
-      //       color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
-      //       iconSize: 35.0,
-      //       activeColor: MzanziInnovationHub.of(context)!.theme.primaryColor(),
-      //       tabBackgroundColor:
-      //           MzanziInnovationHub.of(context)!.theme.secondaryColor(),
-      //       //gap: 20,
-      //       //padding: EdgeInsets.all(15),
-      //       tabs: [
-      //         GButton(
-      //           icon: Icons.perm_identity,
-      //           text: "Personal",
-      //           onPressed: () {
-      //             setState(() {
-      //               _selectedIndex = 0;
-      //             });
-      //           },
-      //         ),
-      //         GButton(
-      //           icon: Icons.business_center,
-      //           text: "Business",
-      //           onPressed: () {
-      //             setState(() {
-      //               _selectedIndex = 1;
-      //             });
-      //           },
-      //         ),
-      //       ],
-      //       selectedIndex: _selectedIndex,
-      //     ),
-      //   ),
+      //),
+      //   ],
       // ),
+      bottomNavigationBar: Visibility(
+        visible: isBusinessUser(widget.signedInUser),
+        child: Padding(
+          padding: const EdgeInsets.all(15.0),
+          child: GNav(
+            //hoverColor: Colors.lightBlueAccent,
+            color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+            iconSize: 35.0,
+            activeColor: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+            tabBackgroundColor:
+                MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+            //gap: 20,
+            //padding: EdgeInsets.all(15),
+            tabs: [
+              GButton(
+                icon: Icons.perm_identity,
+                text: "Personal",
+                onPressed: () {
+                  setState(() {
+                    _selectedIndex = 0;
+                  });
+                },
+              ),
+              GButton(
+                icon: Icons.business_center,
+                text: "Business",
+                onPressed: () {
+                  setState(() {
+                    _selectedIndex = 1;
+                  });
+                },
+              ),
+            ],
+            selectedIndex: _selectedIndex,
+          ),
+        ),
+      ),
     );
   }
 }
diff --git a/Frontend/patient_manager/lib/components/mihAppBar.dart b/Frontend/patient_manager/lib/components/mihAppBar.dart
index 9a5c925c..c7dbd12e 100644
--- a/Frontend/patient_manager/lib/components/mihAppBar.dart
+++ b/Frontend/patient_manager/lib/components/mihAppBar.dart
@@ -26,17 +26,22 @@ class _MIHAppBarState extends State<MIHAppBar> {
     return AppBar(
       elevation: 8,
       shadowColor: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
-      actions: [
-        IconButton(
-          icon: const Icon(
-            Icons.home,
-            size: 40,
-          ),
-          onPressed: () {
-            Navigator.popAndPushNamed(context, '/home');
-          },
-        )
-      ],
+      // actions: [
+      //   IconButton(
+      //     icon: const Icon(
+      //       Icons.home,
+      //       size: 40,
+      //     ),
+      //     onPressed: () {
+      //       //   Navigator.pushNamedAndRemoveUntil(
+      //       //     context,
+      //       //     '/home',
+      //       //   );
+      //       Navigator.of(context)
+      //           .pushNamedAndRemoveUntil('/home', (route) => false);
+      //     },
+      //   )
+      // ],
       title: Text(
         widget.barTitle,
         textAlign: TextAlign.center,
diff --git a/Frontend/patient_manager/lib/components/mihAppDrawer.dart b/Frontend/patient_manager/lib/components/mihAppDrawer.dart
index 67da3b06..af4cb2a8 100644
--- a/Frontend/patient_manager/lib/components/mihAppDrawer.dart
+++ b/Frontend/patient_manager/lib/components/mihAppDrawer.dart
@@ -138,7 +138,8 @@ class _MIHAppDrawerState extends State<MIHAppDrawer> {
                 ],
               ),
               onTap: () {
-                Navigator.popAndPushNamed(context, '/home');
+                Navigator.of(context)
+                    .pushNamedAndRemoveUntil('/home', (route) => false);
               },
             ),
             ListTile(
diff --git a/Frontend/patient_manager/lib/components/mihLoadingCircle.dart b/Frontend/patient_manager/lib/components/mihLoadingCircle.dart
index ac0c3e99..a0a6eab9 100644
--- a/Frontend/patient_manager/lib/components/mihLoadingCircle.dart
+++ b/Frontend/patient_manager/lib/components/mihLoadingCircle.dart
@@ -31,6 +31,7 @@ class _MihloadingcircleState extends State<Mihloadingcircle>
     ImageProvider loading =
         MzanziInnovationHub.of(context)!.theme.loadingImage();
     return Dialog(
+      //backgroundColor: MzanziInnovationHub.of(context)!.theme.primaryColor(),
       child: Container(
         padding: const EdgeInsets.all(10.0),
         width: 250,
diff --git a/Frontend/patient_manager/lib/pages/patientAccessReview.dart b/Frontend/patient_manager/lib/pages/patientAccessReview.dart
index 72c5f392..38534565 100644
--- a/Frontend/patient_manager/lib/pages/patientAccessReview.dart
+++ b/Frontend/patient_manager/lib/pages/patientAccessReview.dart
@@ -4,7 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:patient_manager/components/builders/buildAccessRequestList.dart';
 import 'package:patient_manager/components/inputsAndButtons/mihDropdownInput.dart';
 import 'package:patient_manager/components/mihAppBar.dart';
-import 'package:patient_manager/components/mihAppDrawer.dart';
+//import 'package:patient_manager/components/mihAppDrawer.dart';
 import 'package:patient_manager/components/mihLoadingCircle.dart';
 import 'package:patient_manager/env/env.dart';
 import 'package:patient_manager/main.dart';
@@ -268,7 +268,7 @@ class _PatientAccessRequestState extends State<PatientAccessRequest> {
     final screenHeight = MediaQuery.of(context).size.height;
     return Scaffold(
       appBar: const MIHAppBar(barTitle: "Access Reviews"),
-      drawer: MIHAppDrawer(signedInUser: widget.signedInUser),
+      //drawer: MIHAppDrawer(signedInUser: widget.signedInUser),
       body: viewAccessRequest(screenWidth, screenHeight),
     );
   }
diff --git a/Frontend/patient_manager/lib/pages/patientAdd.dart b/Frontend/patient_manager/lib/pages/patientAdd.dart
index e54610fb..dca54c5f 100644
--- a/Frontend/patient_manager/lib/pages/patientAdd.dart
+++ b/Frontend/patient_manager/lib/pages/patientAdd.dart
@@ -3,7 +3,7 @@ import 'dart:convert';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:patient_manager/components/inputsAndButtons/mihDropdownInput.dart';
-import 'package:patient_manager/components/mihAppDrawer.dart';
+//import 'package:patient_manager/components/mihAppDrawer.dart';
 import 'package:patient_manager/components/popUpMessages/mihErrorMessage.dart';
 import 'package:patient_manager/components/popUpMessages/mihSuccessMessage.dart';
 import 'package:patient_manager/components/inputsAndButtons/mihTextInput.dart';
@@ -344,7 +344,7 @@ class _AddPatientState extends State<AddPatient> {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: const MIHAppBar(barTitle: "Add Patient"),
-      drawer: MIHAppDrawer(signedInUser: widget.signedInUser),
+      //drawer: MIHAppDrawer(signedInUser: widget.signedInUser),
       body: KeyboardListener(
         focusNode: _focusNode,
         autofocus: true,
diff --git a/Frontend/patient_manager/lib/pages/patientManager.dart b/Frontend/patient_manager/lib/pages/patientManager.dart
index 56f03f56..e77e0886 100644
--- a/Frontend/patient_manager/lib/pages/patientManager.dart
+++ b/Frontend/patient_manager/lib/pages/patientManager.dart
@@ -7,7 +7,7 @@ import 'package:flutter/services.dart';
 import 'package:patient_manager/components/builders/buildPatientList.dart';
 import 'package:patient_manager/components/builders/buildPatientQueueList.dart';
 import 'package:patient_manager/components/mihAppBar.dart';
-import 'package:patient_manager/components/mihAppDrawer.dart';
+//import 'package:patient_manager/components/mihAppDrawer.dart';
 import 'package:patient_manager/components/mihLoadingCircle.dart';
 import 'package:patient_manager/components/inputsAndButtons/mihDateInput.dart';
 import 'package:patient_manager/components/popUpMessages/mihErrorMessage.dart';
@@ -469,7 +469,7 @@ class _PatientManagerState extends State<PatientManager> {
     final screenHeight = MediaQuery.of(context).size.height;
     return Scaffold(
       appBar: const MIHAppBar(barTitle: "Patient Manager"),
-      drawer: MIHAppDrawer(signedInUser: widget.arguments.signedInUser),
+      //drawer: MIHAppDrawer(signedInUser: widget.arguments.signedInUser),
       //floatingActionButtonLocation: FloatingActionButtonLocation.,
       // floatingActionButton: FloatingActionButton.extended(
       //   label: Text(
diff --git a/Frontend/patient_manager/lib/pages/patientView.dart b/Frontend/patient_manager/lib/pages/patientView.dart
index 74c650fa..7eb4ab68 100644
--- a/Frontend/patient_manager/lib/pages/patientView.dart
+++ b/Frontend/patient_manager/lib/pages/patientView.dart
@@ -96,7 +96,7 @@ class _PatientViewState extends State<PatientView> {
     // var logo = MzanziInnovationHub.of(context)!.theme.logoImage();
     return Scaffold(
       appBar: const MIHAppBar(barTitle: "Patient Profile"),
-      drawer: showDrawer(),
+      //drawer: showDrawer(),
       body: SingleChildScrollView(
         child: Padding(
           padding: const EdgeInsets.symmetric(vertical: 10.0, horizontal: 15.0),
diff --git a/Frontend/patient_manager/lib/pages/profileBusinessAdd.dart b/Frontend/patient_manager/lib/pages/profileBusinessAdd.dart
index 2facd21d..226f64ff 100644
--- a/Frontend/patient_manager/lib/pages/profileBusinessAdd.dart
+++ b/Frontend/patient_manager/lib/pages/profileBusinessAdd.dart
@@ -3,7 +3,7 @@ import 'dart:convert';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:patient_manager/components/mihAppBar.dart';
-import 'package:patient_manager/components/mihAppDrawer.dart';
+//import 'package:patient_manager/components/mihAppDrawer.dart';
 import 'package:patient_manager/components/mihLoadingCircle.dart';
 import 'package:patient_manager/components/inputsAndButtons/mihDropdownInput.dart';
 import 'package:patient_manager/components/popUpMessages/mihErrorMessage.dart';
@@ -229,7 +229,7 @@ class _ProfileBusinessAddState extends State<ProfileBusinessAdd> {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: const MIHAppBar(barTitle: "Add Business"),
-      drawer: MIHAppDrawer(signedInUser: widget.signedInUser),
+      //drawer: MIHAppDrawer(signedInUser: widget.signedInUser),
       body: KeyboardListener(
         focusNode: _focusNode,
         autofocus: true,
diff --git a/Frontend/patient_manager/lib/pages/profileBusinessUpdate.dart b/Frontend/patient_manager/lib/pages/profileBusinessUpdate.dart
index 3f0c39f3..44e69b3d 100644
--- a/Frontend/patient_manager/lib/pages/profileBusinessUpdate.dart
+++ b/Frontend/patient_manager/lib/pages/profileBusinessUpdate.dart
@@ -4,7 +4,7 @@ import 'package:file_picker/file_picker.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:patient_manager/components/mihAppBar.dart';
-import 'package:patient_manager/components/mihAppDrawer.dart';
+//import 'package:patient_manager/components/mihAppDrawer.dart';
 import 'package:patient_manager/components/mihLoadingCircle.dart';
 import 'package:patient_manager/components/inputsAndButtons/mihDropdownInput.dart';
 import 'package:patient_manager/components/popUpMessages/mihErrorMessage.dart';
@@ -313,7 +313,7 @@ class _ProfileBusinessUpdateState extends State<ProfileBusinessUpdate> {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: const MIHAppBar(barTitle: "Business Profile"),
-      drawer: MIHAppDrawer(signedInUser: widget.arguments.signedInUser),
+      //drawer: MIHAppDrawer(signedInUser: widget.arguments.signedInUser),
       body: KeyboardListener(
         focusNode: _focusNode,
         autofocus: true,
diff --git a/Frontend/patient_manager/lib/pages/profileUserUpdate.dart b/Frontend/patient_manager/lib/pages/profileUserUpdate.dart
index 6a63439d..067aa3e0 100644
--- a/Frontend/patient_manager/lib/pages/profileUserUpdate.dart
+++ b/Frontend/patient_manager/lib/pages/profileUserUpdate.dart
@@ -3,7 +3,7 @@ import 'dart:convert';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:patient_manager/components/mihAppBar.dart';
-import 'package:patient_manager/components/mihAppDrawer.dart';
+// import 'package:patient_manager/components/mihAppDrawer.dart';
 import 'package:patient_manager/components/popUpMessages/mihErrorMessage.dart';
 import 'package:patient_manager/components/popUpMessages/mihSuccessMessage.dart';
 import 'package:patient_manager/components/inputsAndButtons/mihTextInput.dart';
@@ -168,7 +168,7 @@ class _ProfileUserUpdateState extends State<ProfileUserUpdate> {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: const MIHAppBar(barTitle: "Update Profile"),
-      drawer: MIHAppDrawer(signedInUser: widget.signedInUser),
+      //drawer: MIHAppDrawer(signedInUser: widget.signedInUser),
       body: Padding(
         padding: const EdgeInsets.all(15.0),
         child: Center(
diff --git a/Frontend/patient_manager/lib/theme/mihTheme.dart b/Frontend/patient_manager/lib/theme/mihTheme.dart
index 2124585d..fa5ed69f 100644
--- a/Frontend/patient_manager/lib/theme/mihTheme.dart
+++ b/Frontend/patient_manager/lib/theme/mihTheme.dart
@@ -118,11 +118,11 @@ class MyTheme {
   AssetImage loadingImage() {
     if (mode == "Dark") {
       loading = const AssetImage(
-        'images/loading_dark.gif',
+        'images/loading_light.gif',
       );
     } else {
       loading = const AssetImage(
-        'images/loading_light.gif',
+        'images/loading_dark.gif',
       );
     }
     return loading;
diff --git a/Frontend/patient_manager/web/index.html b/Frontend/patient_manager/web/index.html
index 9e9110d1..f469b31e 100644
--- a/Frontend/patient_manager/web/index.html
+++ b/Frontend/patient_manager/web/index.html
@@ -30,36 +30,14 @@
   <title>Mzansi Innovation Hub</title>
   <link rel="manifest" href="manifest.json">
   <!-- <style>
-    .main {
-      width: 100%;
-      height: 100vh;
-      background-color: #3A4454;
-      display: flex; /* Default Axis is X*/
-      flex-direction: column;
-      justify-content: center; /* Main Axis */
-      align-items: center; /* Cross Axis */
-      
-    }
-    .indicator{
-      width: 100px;
-    }
-    .writting{
-      font-size: 15px;
-      font-family: fantasy;
-      color: #bedcfe;
-      position: absolute;
-      bottom: 0;
-      padding-bottom: 3%
-    }
     .bg{
       background-color: #3A4454;
       overflow: hidden
-      
     }
-</style> -->
+  </style> -->
   
   
-  <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" name="viewport">
+  <!-- <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" name="viewport"> -->
   
  
   <style id="splash-screen-style">
@@ -128,7 +106,7 @@
     }
   </script>
 </head>
-<body class="bg">
+<body>
   <picture id="splash-branding">
     <source srcset="splash/img/branding-1x.png 1x, splash/img/branding-2x.png 2x, splash/img/branding-3x.png 3x, splash/img/branding-4x.png 4x" media="(prefers-color-scheme: light)">
     <source srcset="splash/img/branding-dark-1x.png 1x, splash/img/branding-dark-2x.png 2x, splash/img/branding-dark-3x.png 3x, splash/img/branding-dark-4x.png 4x" media="(prefers-color-scheme: dark)">
@@ -163,7 +141,7 @@
 
 <!-- Versioning -->
 <script defer>
-  var serviceWorkerVersion = null;
+  var serviceWorkerVersion = '{{flutter_service_worker_version}}';
   var scriptLoaded = false;
   function loadMainDartJs() {
     if (scriptLoaded) {