diff --git a/Frontend/lib/mih_packages/mih_home/package_tools/mih_business_home.dart b/Frontend/lib/mih_packages/mih_home/package_tools/mih_business_home.dart
index 738ad4b1..34a1864a 100644
--- a/Frontend/lib/mih_packages/mih_home/package_tools/mih_business_home.dart
+++ b/Frontend/lib/mih_packages/mih_home/package_tools/mih_business_home.dart
@@ -1,3 +1,4 @@
+import 'package:go_router/go_router.dart';
 import 'package:mzansi_innovation_hub/main.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_single_child_scroll.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart';
@@ -244,15 +245,24 @@ class _MihBusinessHomeState extends State<MihBusinessHome>
                 hintColor: MihColors.getPrimaryColor(
                     MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 onPrefixIconTap: () {
-                  Navigator.of(context).pushNamed(
-                    '/mzansi-ai',
-                    arguments: MzansiAiArguments(
+                  context.goNamed(
+                    "mzansiAi",
+                    extra: MzansiAiArguments(
                       widget.signedInUser,
                       searchController.text.isEmpty
                           ? null
                           : searchController.text,
                     ),
                   );
+                  // Navigator.of(context).pushNamed(
+                  //   '/mzansi-ai',
+                  //   arguments: MzansiAiArguments(
+                  //     widget.signedInUser,
+                  //     searchController.text.isEmpty
+                  //         ? null
+                  //         : searchController.text,
+                  //   ),
+                  // );
                   searchController.clear();
                 },
                 searchFocusNode: _searchFocusNode,
diff --git a/Frontend/lib/mih_packages/mih_home/package_tools/mih_personal_home.dart b/Frontend/lib/mih_packages/mih_home/package_tools/mih_personal_home.dart
index def04d9f..926958e9 100644
--- a/Frontend/lib/mih_packages/mih_home/package_tools/mih_personal_home.dart
+++ b/Frontend/lib/mih_packages/mih_home/package_tools/mih_personal_home.dart
@@ -1,3 +1,4 @@
+import 'package:go_router/go_router.dart';
 import 'package:mzansi_innovation_hub/main.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_single_child_scroll.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart';
@@ -219,9 +220,9 @@ class _MihPersonalHomeState extends State<MihPersonalHome>
 
   void autoNavToProfile() {
     WidgetsBinding.instance.addPostFrameCallback((_) {
-      Navigator.of(context).pushNamed(
-        '/mzansi-profile',
-        arguments: AppProfileUpdateArguments(
+      context.goNamed(
+        'mzansiProfileManage',
+        extra: AppProfileUpdateArguments(
           widget.signedInUser,
           widget.propicFile,
         ),
@@ -299,15 +300,24 @@ class _MihPersonalHomeState extends State<MihPersonalHome>
                 hintColor: MihColors.getPrimaryColor(
                     MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 onPrefixIconTap: () {
-                  Navigator.of(context).pushNamed(
-                    '/mzansi-ai',
-                    arguments: MzansiAiArguments(
+                  context.goNamed(
+                    "mzansiAi",
+                    extra: MzansiAiArguments(
                       widget.signedInUser,
                       searchController.text.isEmpty
                           ? null
                           : searchController.text,
                     ),
                   );
+                  // Navigator.of(context).pushNamed(
+                  //   '/mzansi-ai',
+                  //   arguments: MzansiAiArguments(
+                  //     widget.signedInUser,
+                  //     searchController.text.isEmpty
+                  //         ? null
+                  //         : searchController.text,
+                  //   ),
+                  // );
                   searchController.clear();
                 },
                 searchFocusNode: _searchFocusNode,
diff --git a/Frontend/lib/mih_packages/mzansi_ai/mzansi_ai.dart b/Frontend/lib/mih_packages/mzansi_ai/mzansi_ai.dart
index 4d7c2ca9..0fdb6647 100644
--- a/Frontend/lib/mih_packages/mzansi_ai/mzansi_ai.dart
+++ b/Frontend/lib/mih_packages/mzansi_ai/mzansi_ai.dart
@@ -1,3 +1,4 @@
+import 'package:go_router/go_router.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_action.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tools.dart';
@@ -28,7 +29,13 @@ class _MzansiAiState extends State<MzansiAi> {
       icon: const Icon(Icons.arrow_back),
       iconSize: 35,
       onTap: () {
-        Navigator.of(context).pop();
+        context.goNamed(
+          'home',
+          extra: AuthArguments(
+            true,
+            false,
+          ),
+        );
         FocusScope.of(context).unfocus();
       },
     );
diff --git a/Frontend/lib/mih_packages/mzansi_ai/package_tiles/mzansi_ai_tile.dart b/Frontend/lib/mih_packages/mzansi_ai/package_tiles/mzansi_ai_tile.dart
index af830803..5361524e 100644
--- a/Frontend/lib/mih_packages/mzansi_ai/package_tiles/mzansi_ai_tile.dart
+++ b/Frontend/lib/mih_packages/mzansi_ai/package_tiles/mzansi_ai_tile.dart
@@ -1,3 +1,4 @@
+import 'package:go_router/go_router.dart';
 import 'package:mzansi_innovation_hub/main.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tile.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart';
@@ -25,13 +26,20 @@ class _MzansiAiTileState extends State<MzansiAiTile> {
   Widget build(BuildContext context) {
     return MihPackageTile(
       onTap: () {
-        Navigator.of(context).pushNamed(
-          '/mzansi-ai',
-          arguments: MzansiAiArguments(
+        context.goNamed(
+          'mzansiAi',
+          extra: MzansiAiArguments(
             widget.signedInUser,
             "",
           ),
         );
+        // Navigator.of(context).pushNamed(
+        //   '/mzansi-ai',
+        //   arguments: MzansiAiArguments(
+        //     widget.signedInUser,
+        //     "",
+        //   ),
+        // );
       },
       appName: "Mzansi AI",
       appIcon: Icon(