diff --git a/lib/pages/TestPages/test_filter_screen.dart b/lib/pages/TestPages/test_filter_screen.dart
index e2e919f..10358ec 100755
--- a/lib/pages/TestPages/test_filter_screen.dart
+++ b/lib/pages/TestPages/test_filter_screen.dart
@@ -359,25 +359,28 @@ class _TestFilterScreenState extends State<TestFilterScreen> {
                                       fDateCTRL.text,
                                       uDateCTRL.text,
                                     );
-                                    showDialog(
-                                      context: context,
-                                      builder: (ctx) => AlertDialog(
-                                        content: Text('Filters changed.'),
-                                        actions: <Widget>[
-                                          TextButton(
-                                            onPressed: () {
-                                              Navigator.of(ctx).pop();
-                                              // Navigator.of(context).pop();
-                                            },
-                                            child: Text('Ok'),
-                                          )
-                                        ],
-                                      ),
-                                    ).then(
-                                      (_) =>
-                                          Navigator.of(context).popAndPushNamed(
-                                        Routes.testResultScreen,
-                                      ),
+                                    // showDialog(
+                                    //   context: context,
+                                    //   builder: (ctx) => AlertDialog(
+                                    //     content: Text('Filters changed.'),
+                                    //     actions: <Widget>[
+                                    //       TextButton(
+                                    //         onPressed: () {
+                                    //           Navigator.of(ctx).pop();
+                                    //           // Navigator.of(context).pop();
+                                    //         },
+                                    //         child: Text('Ok'),
+                                    //       )
+                                    //     ],
+                                    //   ),
+                                    // ).then(
+                                    //   (_) =>
+                                    //       Navigator.of(context).popAndPushNamed(
+                                    //     Routes.testResultScreen,
+                                    //   ),
+                                    // );
+                                    Navigator.of(context).popAndPushNamed(
+                                      Routes.testResultScreen,
                                     );
                                   },
                                   child: Container(
diff --git a/lib/widgets/CycleScreens/Filter/save_button.dart b/lib/widgets/CycleScreens/Filter/save_button.dart
index da628c5..1049a27 100755
--- a/lib/widgets/CycleScreens/Filter/save_button.dart
+++ b/lib/widgets/CycleScreens/Filter/save_button.dart
@@ -45,22 +45,23 @@ class CycleFilterSaveButton extends StatelessWidget {
           hospitalID,
           dateCTRL.text,
         );
-        showDialog(
-          context: context,
-          builder: (ctx) => AlertDialog(
-            content: Text('Filters changed.'),
-            actions: <Widget>[
-              TextButton(
-                onPressed: () {
-                  Navigator.of(ctx).pop();
-                },
-                child: Text('Ok'),
-              )
-            ],
-          ),
-        ).then((_) {
-          Navigator.of(context).popAndPushNamed(Routes.cycleResultScreen);
-        });
+        // showDialog(
+        //   context: context,
+        //   builder: (ctx) => AlertDialog(
+        //     content: Text('Filters changed.'),
+        //     actions: <Widget>[
+        //       TextButton(
+        //         onPressed: () {
+        //           Navigator.of(ctx).pop();
+        //         },
+        //         child: Text('Ok'),
+        //       )
+        //     ],
+        //   ),
+        // ).then((_) {
+        //   Navigator.of(context).popAndPushNamed(Routes.cycleResultScreen);
+        // });
+        Navigator.of(context).popAndPushNamed(Routes.cycleResultScreen);
       },
       child: Container(
         padding: EdgeInsets.symmetric(
diff --git a/lib/widgets/ItemScreens/Filter/item_filter_button.dart b/lib/widgets/ItemScreens/Filter/item_filter_button.dart
index cca49f6..803b597 100755
--- a/lib/widgets/ItemScreens/Filter/item_filter_button.dart
+++ b/lib/widgets/ItemScreens/Filter/item_filter_button.dart
@@ -51,22 +51,23 @@ class ItemFilterSaveButton extends StatelessWidget {
           sizeCTRL.text,
           specificCTRL.text,
         );
-        showDialog(
-          context: context,
-          builder: (ctx) => AlertDialog(
-            content: Text('Filters changed.'),
-            actions: <Widget>[
-              TextButton(
-                onPressed: () {
-                  Navigator.of(ctx).pop();
-                },
-                child: Text('Ok'),
-              )
-            ],
-          ),
-        ).then((_) {
-          Navigator.of(context).popAndPushNamed(push);
-        });
+        // showDialog(
+        //   context: context,
+        //   builder: (ctx) => AlertDialog(
+        //     content: Text('Filters changed.'),
+        //     actions: <Widget>[
+        //       TextButton(
+        //         onPressed: () {
+        //           Navigator.of(ctx).pop();
+        //         },
+        //         child: Text('Ok'),
+        //       )
+        //     ],
+        //   ),
+        // ).then((_) {
+        //   Navigator.of(context).popAndPushNamed(push);
+        // });
+        Navigator.of(context).popAndPushNamed(push);
       },
       child: Container(
         padding: EdgeInsets.symmetric(
diff --git a/lib/widgets/LabelScreens/Filter/save_button.dart b/lib/widgets/LabelScreens/Filter/save_button.dart
index 787cbd9..c6260c5 100755
--- a/lib/widgets/LabelScreens/Filter/save_button.dart
+++ b/lib/widgets/LabelScreens/Filter/save_button.dart
@@ -42,22 +42,23 @@ class LabelFilterSaveButton extends StatelessWidget {
           striizerIdCTRL.text,
           hospitalID,
         );
-        showDialog(
-          context: context,
-          builder: (ctx) => AlertDialog(
-            content: Text('Filters changed.'),
-            actions: <Widget>[
-              TextButton(
-                onPressed: () {
-                  Navigator.of(ctx).pop();
-                },
-                child: Text('Ok'),
-              )
-            ],
-          ),
-        ).then((_) {
-          Navigator.of(context).popAndPushNamed(Routes.labelResultScreen);
-        });
+        // showDialog(
+        //   context: context,
+        //   builder: (ctx) => AlertDialog(
+        //     content: Text('Filters changed.'),
+        //     actions: <Widget>[
+        //       TextButton(
+        //         onPressed: () {
+        //           Navigator.of(ctx).pop();
+        //         },
+        //         child: Text('Ok'),
+        //       )
+        //     ],
+        //   ),
+        // ).then((_) {
+        //   Navigator.of(context).popAndPushNamed(Routes.labelResultScreen);
+        // });
+        Navigator.of(context).popAndPushNamed(Routes.labelResultScreen);
       },
       child: Container(
         padding: EdgeInsets.symmetric(
diff --git a/lib/widgets/MyItemsScreens/Filter/my_items_filter_button.dart b/lib/widgets/MyItemsScreens/Filter/my_items_filter_button.dart
index 914bee0..0110cfb 100755
--- a/lib/widgets/MyItemsScreens/Filter/my_items_filter_button.dart
+++ b/lib/widgets/MyItemsScreens/Filter/my_items_filter_button.dart
@@ -38,22 +38,23 @@ class MyItemFilterSaveButton extends StatelessWidget {
           sizeCTRL.text,
           specificCTRL.text,
         );
-        showDialog(
-          context: context,
-          builder: (ctx) => AlertDialog(
-            content: Text('Filters changed.'),
-            actions: <Widget>[
-              TextButton(
-                onPressed: () {
-                  Navigator.of(ctx).pop();
-                },
-                child: Text('Ok'),
-              )
-            ],
-          ),
-        ).then((_) {
-          Navigator.of(context).popAndPushNamed(push);
-        });
+        // showDialog(
+        //   context: context,
+        //   builder: (ctx) => AlertDialog(
+        //     content: Text('Filters changed.'),
+        //     actions: <Widget>[
+        //       TextButton(
+        //         onPressed: () {
+        //           Navigator.of(ctx).pop();
+        //         },
+        //         child: Text('Ok'),
+        //       )
+        //     ],
+        //   ),
+        // ).then((_) {
+        //   Navigator.of(context).popAndPushNamed(push);
+        // });
+        Navigator.of(context).popAndPushNamed(push);
       },
       child: Container(
         padding: EdgeInsets.symmetric(
diff --git a/lib/widgets/MyPackagesScreens/Filter/my_packages_filter_button.dart b/lib/widgets/MyPackagesScreens/Filter/my_packages_filter_button.dart
index d61601d..3b96e05 100755
--- a/lib/widgets/MyPackagesScreens/Filter/my_packages_filter_button.dart
+++ b/lib/widgets/MyPackagesScreens/Filter/my_packages_filter_button.dart
@@ -32,22 +32,23 @@ class MyPackagesFilterSaveButton extends StatelessWidget {
           nameCTRL.text,
           // udiCTRL.text,
         );
-        showDialog(
-          context: context,
-          builder: (ctx) => AlertDialog(
-            content: Text('Filters changed.'),
-            actions: <Widget>[
-              TextButton(
-                onPressed: () {
-                  Navigator.of(ctx).pop();
-                },
-                child: Text('Ok'),
-              )
-            ],
-          ),
-        ).then((_) {
-          Navigator.of(context).popAndPushNamed(push);
-        });
+        // showDialog(
+        //   context: context,
+        //   builder: (ctx) => AlertDialog(
+        //     content: Text('Filters changed.'),
+        //     actions: <Widget>[
+        //       TextButton(
+        //         onPressed: () {
+        //           Navigator.of(ctx).pop();
+        //         },
+        //         child: Text('Ok'),
+        //       )
+        //     ],
+        //   ),
+        // ).then((_) {
+        //   Navigator.of(context).popAndPushNamed(push);
+        // });
+        Navigator.of(context).popAndPushNamed(push);
       },
       child: Container(
         padding: EdgeInsets.symmetric(
diff --git a/lib/widgets/PackageScreens/Filter/filter_button.dart b/lib/widgets/PackageScreens/Filter/filter_button.dart
index 0301050..adf41d7 100755
--- a/lib/widgets/PackageScreens/Filter/filter_button.dart
+++ b/lib/widgets/PackageScreens/Filter/filter_button.dart
@@ -42,22 +42,23 @@ class PackageFilterSaveButton extends StatelessWidget {
           hospitalID,
           // udiCTRL.text,
         );
-        showDialog(
-          context: context,
-          builder: (ctx) => AlertDialog(
-            content: Text('Filters changed.'),
-            actions: <Widget>[
-              TextButton(
-                onPressed: () {
-                  Navigator.of(ctx).pop();
-                },
-                child: Text('Ok'),
-              )
-            ],
-          ),
-        ).then((_) {
-          Navigator.of(context).popAndPushNamed(Routes.packageResultScreen);
-        });
+        // showDialog(
+        //   context: context,
+        //   builder: (ctx) => AlertDialog(
+        //     content: Text('Filters changed.'),
+        //     actions: <Widget>[
+        //       TextButton(
+        //         onPressed: () {
+        //           Navigator.of(ctx).pop();
+        //         },
+        //         child: Text('Ok'),
+        //       )
+        //     ],
+        //   ),
+        // ).then((_) {
+        //   Navigator.of(context).popAndPushNamed(Routes.packageResultScreen);
+        // });
+        Navigator.of(context).popAndPushNamed(Routes.packageResultScreen);
       },
       child: Container(
         padding: EdgeInsets.symmetric(