diff --git a/app/Filament/Resources/AnnouncementResource.php b/app/Filament/Resources/AnnouncementResource.php
index 9e745614..88ea9eab 100644
--- a/app/Filament/Resources/AnnouncementResource.php
+++ b/app/Filament/Resources/AnnouncementResource.php
@@ -18,7 +18,7 @@ class AnnouncementResource extends Resource
 {
     protected static ?string $model = Announcement::class;
 
-    protected static ?string $navigationIcon = 'heroicon-o-rectangle-stack';
+    protected static ?string $navigationIcon = 'heroicon-o-bell';
 
     public static function form(Form $form): Form
     {
@@ -47,21 +47,18 @@ public static function form(Form $form): Form
                             ->maxLength(500),
                     ]),
                 Forms\Components\Section::make('Dates')
-                    ->description('All announcements will start at 00:00:00 UTC and end at 23:59:59 UTC of the dates selected!')
+                    ->description('Announcements times are in UTC')
                     ->schema([
                         Forms\Components\DateTimePicker::make('start_at')
                             ->label('Start Date')
-                            ->Time(false)
-                            ->default(fn () => now()->startOfDay())
+                            ->default(fn () => now())
                             ->required()
-                            ->afterOrEqual('yesterday')
-                            ->beforeOrEqual('end_at'),
+                            ->before('end_at'),
                         Forms\Components\DateTimePicker::make('end_at')
                             ->label('End Date')
-                            ->Time(false)
-                            ->default(fn () => now()->endOfDay())
+                            ->default(fn () => now()->addDay()->endOfDay())
                             ->required()
-                            ->afterOrEqual('start_at'),
+                            ->after('start_at'),
                     ]),
             ]);
     }
@@ -89,9 +86,10 @@ public static function table(Table $table): Table
                     ->label('End (UTC)')
                     ->datetime('M d, Y H:i')
                     ->sortable(),
-                Tables\Columns\BadgeColumn::make('status')
+                Tables\Columns\TextColumn::make('status')
+                    ->badge(true)
                     ->label('Status')
-                    ->getStateUsing(function ($record) {
+                    ->getStateUsing(function (Announcement $record) {
                         $now = Carbon::now();
                         if ($record->start_at > $now) {
                             return 'Upcoming';
@@ -115,12 +113,7 @@ public static function table(Table $table): Table
             ])
             ->actions([
                 Tables\Actions\ViewAction::make(),
-                Tables\Actions\EditAction::make()
-                    ->mutateFormDataUsing(function (array $data): array {
-                        $data['end_at'] = $data['end_at'].'T23:59:59';
-
-                        return $data;
-                    }),
+                Tables\Actions\EditAction::make(),
                 Tables\Actions\DeleteAction::make(),
             ])
             ->bulkActions([
@@ -199,7 +192,7 @@ public static function getPages(): array
         return [
             'index' => Pages\ListAnnouncements::route('/'),
             'create' => Pages\CreateAnnouncement::route('/create'),
-            //	    'edit' => Pages\EditAnnouncement::route('/{record}/edit'),
+            'edit' => Pages\EditAnnouncement::route('/{record}/edit'),
         ];
     }
 }
diff --git a/app/Filament/Resources/AnnouncementResource/Pages/CreateAnnouncement.php b/app/Filament/Resources/AnnouncementResource/Pages/CreateAnnouncement.php
index 83d14fd6..6cc55f3b 100644
--- a/app/Filament/Resources/AnnouncementResource/Pages/CreateAnnouncement.php
+++ b/app/Filament/Resources/AnnouncementResource/Pages/CreateAnnouncement.php
@@ -10,11 +10,4 @@ class CreateAnnouncement extends CreateRecord
     protected static string $resource = AnnouncementResource::class;
 
     protected static bool $canCreateAnother = false;
-
-    protected function mutateFormDataBeforeCreate(array $data): array
-    {
-        $data['end_at'] = $data['end_at'].'T23:59:59';
-
-        return $data;
-    }
 }
diff --git a/app/Filament/Resources/AnnouncementResource/Pages/EditAnnouncement.php b/app/Filament/Resources/AnnouncementResource/Pages/EditAnnouncement.php
index b38bea63..0dcdad14 100644
--- a/app/Filament/Resources/AnnouncementResource/Pages/EditAnnouncement.php
+++ b/app/Filament/Resources/AnnouncementResource/Pages/EditAnnouncement.php
@@ -10,10 +10,10 @@ class EditAnnouncement extends EditRecord
 {
     protected static string $resource = AnnouncementResource::class;
 
-    protected function getHeaderActions(): array
-    {
-        return [
-            Actions\ViewAction::make(),
-        ];
-    }
+    // protected function getHeaderActions(): array
+    // {
+    //     return [
+    //         Actions\ViewAction::make(),
+    //     ];
+    // }
 }
diff --git a/app/Filament/Resources/AnnouncementResource/Pages/ListAnnouncements.php b/app/Filament/Resources/AnnouncementResource/Pages/ListAnnouncements.php
index a8c71e10..30ec65f1 100644
--- a/app/Filament/Resources/AnnouncementResource/Pages/ListAnnouncements.php
+++ b/app/Filament/Resources/AnnouncementResource/Pages/ListAnnouncements.php
@@ -13,7 +13,8 @@ class ListAnnouncements extends ListRecords
     protected function getHeaderActions(): array
     {
         return [
-            Actions\CreateAction::make(),
+            Actions\CreateAction::make()
+                ->icon('heroicon-o-plus-circle'),
         ];
     }
 }
diff --git a/app/Filament/Resources/UserResource.php b/app/Filament/Resources/UserResource.php
index 5e3a581b..49ddea0e 100644
--- a/app/Filament/Resources/UserResource.php
+++ b/app/Filament/Resources/UserResource.php
@@ -17,7 +17,7 @@ class UserResource extends Resource
 {
     protected static ?string $model = User::class;
 
-    protected static ?string $navigationIcon = 'heroicon-o-rectangle-stack';
+    protected static ?string $navigationIcon = 'heroicon-o-users';
 
     public static function form(Form $form): Form
     {