diff --git a/Frontend/lib/mih_components/mih_package_components/Example/package_test.dart b/Frontend/lib/mih_components/mih_package_components/Example/package_test.dart
index 3c473292..16a553f6 100644
--- a/Frontend/lib/mih_components/mih_package_components/Example/package_test.dart
+++ b/Frontend/lib/mih_components/mih_package_components/Example/package_test.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.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_action.dart';
@@ -32,11 +33,19 @@ class _PackageTestState extends State<PackageTest> {
       icon: const Icon(Icons.arrow_back),
       iconSize: 35,
       onTap: () {
-        Navigator.of(context).pop();
-        Navigator.of(context).popAndPushNamed(
-          '/',
-          arguments: AuthArguments(true, false),
+        context.goNamed(
+          'mihHome',
+          extra: AuthArguments(
+            true,
+            false,
+          ),
         );
+        FocusScope.of(context).unfocus();
+        // Navigator.of(context).pop();
+        // Navigator.of(context).popAndPushNamed(
+        //   '/',
+        //   arguments: AuthArguments(true, false),
+        // );
       },
     );
   }
diff --git a/Frontend/lib/mih_components/mih_package_components/Example/package_tiles/test_package_tile.dart b/Frontend/lib/mih_components/mih_package_components/Example/package_tiles/test_package_tile.dart
new file mode 100644
index 00000000..7ef12f06
--- /dev/null
+++ b/Frontend/lib/mih_components/mih_package_components/Example/package_tiles/test_package_tile.dart
@@ -0,0 +1,58 @@
+import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
+import 'package:mzansi_innovation_hub/main.dart';
+import 'package:mzansi_innovation_hub/mih_components/mih_objects/app_user.dart';
+import 'package:mzansi_innovation_hub/mih_components/mih_objects/arguments.dart';
+import 'package:mzansi_innovation_hub/mih_components/mih_objects/business.dart';
+import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tile.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
+
+class TestPackageTile extends StatefulWidget {
+  final AppUser signedInUser;
+  final Business? business;
+  final double packageSize;
+  const TestPackageTile({
+    super.key,
+    required this.signedInUser,
+    required this.business,
+    required this.packageSize,
+  });
+
+  @override
+  State<TestPackageTile> createState() => _TestPackageTileState();
+}
+
+class _TestPackageTileState extends State<TestPackageTile> {
+  @override
+  Widget build(BuildContext context) {
+    return MihPackageTile(
+      onTap: () {
+        context.goNamed(
+          'testPackage',
+          extra: TestArguments(
+            widget.signedInUser,
+            widget.business,
+          ),
+        );
+        // Navigator.of(context).pushNamed(
+        //   '/package-dev',
+        //   arguments: TestArguments(
+        //     widget.signedInUser,
+        //     widget.business,
+        //   ),
+        // );
+      },
+      appName: "Test",
+      appIcon: Icon(
+        Icons.warning_amber_rounded,
+        color: MihColors.getSecondaryColor(
+            MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+      ),
+      iconSize: widget.packageSize,
+      primaryColor: MihColors.getSecondaryColor(
+          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+      secondaryColor: MihColors.getPrimaryColor(
+          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+    );
+  }
+}
diff --git a/Frontend/lib/mih_components/mih_package_components/Example/package_tools/package_tool_one.dart b/Frontend/lib/mih_components/mih_package_components/Example/package_tools/package_tool_one.dart
index ad71ced0..93f83e5d 100644
--- a/Frontend/lib/mih_components/mih_package_components/Example/package_tools/package_tool_one.dart
+++ b/Frontend/lib/mih_components/mih_package_components/Example/package_tools/package_tool_one.dart
@@ -399,11 +399,11 @@ class _PackageToolOneState extends State<PackageToolOne> {
                         );
                       }
                     }),
-                const SizedBox(height: 10),
-                Text("This text should be redacted").redacted(
-                  context: context,
-                  redact: true,
-                ),
+                // const SizedBox(height: 10),
+                // Text("This text should be redacted").redacted(
+                //   context: context,
+                //   redact: true,
+                // ),
                 MihBusinessCard(
                   business: Business(
                     "business_id",
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 fae1c63f..7e07e9dc 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,9 +1,9 @@
 import 'package:go_router/go_router.dart';
 import 'package:mzansi_innovation_hub/main.dart';
+import 'package:mzansi_innovation_hub/mih_components/mih_package_components/Example/package_tiles/test_package_tile.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';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.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_search_bar.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_objects/app_user.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_objects/arguments.dart';
@@ -160,34 +160,10 @@ class _MihPersonalHomeState extends State<MihPersonalHome>
     //=============== Dev ===============
     if (widget.isDevActive) {
       temp.add({
-        "test": MihPackageTile(
-          onTap: () {
-            context.goNamed(
-              'testPackage',
-              extra: TestArguments(
-                widget.signedInUser,
-                widget.business,
-              ),
-            );
-            // Navigator.of(context).pushNamed(
-            //   '/package-dev',
-            //   arguments: TestArguments(
-            //     widget.signedInUser,
-            //     widget.business,
-            //   ),
-            // );
-          },
-          appName: "Test",
-          appIcon: Icon(
-            Icons.warning_amber_rounded,
-            color: MihColors.getSecondaryColor(
-                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-          ),
-          iconSize: packageSize,
-          primaryColor: MihColors.getSecondaryColor(
-              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-          secondaryColor: MihColors.getPrimaryColor(
-              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+        "test": TestPackageTile(
+          signedInUser: widget.signedInUser,
+          business: widget.business,
+          packageSize: packageSize,
         )
       });
     }