diff --git a/lib/widgets/add_Task.dart b/lib/widgets/add_Task.dart
index acbc0a4c..077e4c71 100644
--- a/lib/widgets/add_Task.dart
+++ b/lib/widgets/add_Task.dart
@@ -88,6 +88,7 @@ class _AddTaskBottomSheetState extends State<AddTaskBottomSheet> {
   }
 
   Widget buildName() => TextFormField(
+        autofocus: true,
         controller: namecontroller,
         style: TextStyle(
           color: AppSettings.isDarkMode ? Colors.white : Colors.black,
@@ -321,8 +322,12 @@ class _AddTaskBottomSheetState extends State<AddTaskBottomSheet> {
         if (formKey.currentState!.validate()) {
           if (due == null) {
             ScaffoldMessenger.of(context).showSnackBar(SnackBar(
-              content: const Text(
-                  'Due date cannot be empty. Please select a due date.'),
+              content: Text(
+                'Due date cannot be empty. Please select a due date.',
+                style: TextStyle(
+                  color: AppSettings.isDarkMode ? Colors.white : Colors.black,
+                ),
+              ),
               backgroundColor:
                   AppSettings.isDarkMode ? Colors.black : Colors.white,
               duration: const Duration(seconds: 2),
@@ -343,7 +348,12 @@ class _AddTaskBottomSheetState extends State<AddTaskBottomSheet> {
             widgetController.fetchAllData();
 
             ScaffoldMessenger.of(context).showSnackBar(SnackBar(
-              content: const Text('Task Added Successfully, Tap to Edit'),
+              content: Text(
+                'Task Added Successfully, Tap to Edit',
+                style: TextStyle(
+                  color: AppSettings.isDarkMode ? Colors.white : Colors.black,
+                ),
+              ),
               backgroundColor:
                   AppSettings.isDarkMode ? Colors.black : Colors.white,
               duration: const Duration(seconds: 2),
@@ -360,7 +370,12 @@ class _AddTaskBottomSheetState extends State<AddTaskBottomSheet> {
             }
           } on FormatException catch (e) {
             ScaffoldMessenger.of(context).showSnackBar(SnackBar(
-              content: Text(e.message),
+              content: Text(
+                e.message,
+                style: TextStyle(
+                  color: AppSettings.isDarkMode ? Colors.white : Colors.black,
+                ),
+              ),
               backgroundColor: AppSettings.isDarkMode
                   ? const Color.fromARGB(255, 61, 61, 61)
                   : const Color.fromARGB(255, 39, 39, 39),
diff --git a/lib/widgets/buildTasks.dart b/lib/widgets/buildTasks.dart
index 5a75b2ec..01e8df2e 100644
--- a/lib/widgets/buildTasks.dart
+++ b/lib/widgets/buildTasks.dart
@@ -184,12 +184,6 @@ class _TasksBuilderState extends State<TasksBuilder> {
                                               },
                                               child: const Text('No'),
                                             ),
-                                            TextButton(
-                                              onPressed: () {
-                                                Navigator.of(context).pop();
-                                              },
-                                              child: const Text('Cancel'),
-                                            ),
                                           ],
                                         );
                                       },
@@ -242,12 +236,6 @@ class _TasksBuilderState extends State<TasksBuilder> {
                                               },
                                               child: const Text('No'),
                                             ),
-                                            TextButton(
-                                              onPressed: () {
-                                                Navigator.of(context).pop();
-                                              },
-                                              child: const Text('Cancel'),
-                                            ),
                                           ],
                                         );
                                       },