diff --git a/lib/components/create_join_dialog.dart b/lib/components/create_join_dialog.dart
index e9b5282f..fcef8a36 100644
--- a/lib/components/create_join_dialog.dart
+++ b/lib/components/create_join_dialog.dart
@@ -274,9 +274,10 @@ class CreateJoinBeaconDialog {
                                 model.startingTime.minute,
                               );
                               // localNotif.scheduleNotification();
-                              if (model.startsAt.isBefore(DateTime.now())) {
+                              if (model.startsAt.isBefore(DateTime.now()
+                                  .subtract(Duration(minutes: 1)))) {
                                 navigationService.showSnackBar(
-                                    "Enter a valid date and time!!");
+                                    "Enter a valid date and time!");
                                 return;
                               }
                               model.createHikeRoom();
diff --git a/lib/view_model/home_view_model.dart b/lib/view_model/home_view_model.dart
index c998b906..6a19f9be 100644
--- a/lib/view_model/home_view_model.dart
+++ b/lib/view_model/home_view_model.dart
@@ -42,16 +42,18 @@ class HomeViewModel extends BaseModel {
         hasStarted = DateTime.now()
             .isAfter(DateTime.fromMillisecondsSinceEpoch(beacon.startsAt));
         if (hasStarted) {
-          navigationService.pushScreen('/hikeScreen',
-              arguments: HikeScreen(
-                beacon,
-                isLeader: true,
-              ));
+          navigationService.pushScreen(
+            '/hikeScreen',
+            arguments: HikeScreen(
+              beacon,
+              isLeader: true,
+            ),
+          );
         } else {
           localNotif.scheduleNotification(beacon);
           setState(ViewState.idle);
           navigationService.showSnackBar(
-            'Beacon has not yet started! \nPlease come back at ${DateFormat("hh:mm a, d/M/y").format(DateTime.fromMillisecondsSinceEpoch(beacon.startsAt)).toString()}',
+            'Yay! New beacon created for ${DateFormat("hh:mm a, d/M/y").format(DateTime.fromMillisecondsSinceEpoch(beacon.startsAt)).toString()}',
           );
           return;
         }
@@ -74,10 +76,11 @@ class HomeViewModel extends BaseModel {
       if (beacon != null) {
         hasStarted = DateTime.now()
             .isAfter(DateTime.fromMillisecondsSinceEpoch(beacon.startsAt));
-
         if (hasStarted) {
-          navigationService.pushScreen('/hikeScreen',
-              arguments: HikeScreen(beacon, isLeader: false));
+          navigationService.pushScreen(
+            '/hikeScreen',
+            arguments: HikeScreen(beacon, isLeader: false),
+          );
         } else {
           localNotif.scheduleNotification(beacon);
           setState(ViewState.idle);