diff --git a/app/Helpers/EventHelper.php b/app/Helpers/EventHelper.php
index 5359588..a3dc286 100644
--- a/app/Helpers/EventHelper.php
+++ b/app/Helpers/EventHelper.php
@@ -4,7 +4,6 @@
 
 enum EventHelper: string 
 {
-    case NONE = '0';
     case DAY = 'day';
     case WEEK = 'week';
     case MONTH = 'month';
@@ -13,7 +12,6 @@ enum EventHelper: string
     public static function labels() : array 
     {
         return [
-            self::NONE->value => 'None',
             self::DAY->value => 'Daily',
             self::WEEK->value => 'Weekly',
             self::MONTH->value => 'Monthly',
diff --git a/app/Http/Controllers/EventController.php b/app/Http/Controllers/EventController.php
index 8acac4c..d556839 100644
--- a/app/Http/Controllers/EventController.php
+++ b/app/Http/Controllers/EventController.php
@@ -52,9 +52,9 @@ public function store(Request $request)
             'start_date' => 'required|date_format:Y-m-d H:i|after_or_equal:today',
             'end_date' => 'required|date_format:Y-m-d H:i|after_or_equal:start_date',
             'event_type' => 'integer',
-            'recurrence_interval' => 'nullable|integer',
-            'recurrence_unit' => 'nullable|string|max:255',
-            'recurrence_end_date' => 'nullable|date_format:Y-m-d H:i|after_or_equal:end_date',
+            'recurrence_interval' => 'required_if:event_type,1|integer',
+            'recurrence_unit' => 'required_if:event_type,1|string|max:255|not_in:0',
+            'recurrence_end_date' => 'required_if:event_type,1|date_format:Y-m-d H:i|after_or_equal:end_date',
             'image' => 'nullable|image|mimes:jpeg,jpg,png|max:2048',
         ]);
 
@@ -143,9 +143,9 @@ public function update(Request $request, Event $event)
             'start_date' => 'required|date_format:Y-m-d H:i|after_or_equal:today',
             'end_date' => 'required|date_format:Y-m-d H:i|after_or_equal:start_date',
             'event_type' => 'integer',
-            'recurrence_interval' => 'nullable|integer',
-            'recurrence_unit' => 'nullable|string|max:255',
-            'recurrence_end_date' => 'nullable|date_format:Y-m-d H:i|after_or_equal:end_date',
+            'recurrence_interval' => 'required_if:event_type,1|integer',
+            'recurrence_unit' => 'required_if:event_type,1|string|max:255|not_in:0',
+            'recurrence_end_date' => 'required_if:event_type,1|date_format:Y-m-d H:i|after_or_equal:end_date',
             'image' => 'nullable|image|mimes:jpeg,jpg,png|max:2048',
         ]);
 
@@ -218,6 +218,11 @@ public function destroy(Event $event)
     {
         $this->authorize('destroy', $event);
 
+        // Delete the old image if it exists
+        if ($event->image && $event->parent()->isEmpty()) {
+            Storage::disk('public')->delete('banners/' . $event->image);
+        }
+
         $event->delete();
 
         $event->children()->delete();
diff --git a/resources/views/events/create.blade.php b/resources/views/events/create.blade.php
index bda1ce2..0667101 100644
--- a/resources/views/events/create.blade.php
+++ b/resources/views/events/create.blade.php
@@ -23,7 +23,7 @@
 
                                     <div class="form-group mb-4">
                                         <label for="calendar" class="form-label my-1 me-2">Calendar</label>
-                                        <select name="calendar_id" id="calendar" class="form-control my-1 me-sm-2 @error('calendar') is-invalid @enderror" required>
+                                        <select name="calendar_id" id="calendar" class="form-control my-1 me-sm-2 @error('calendar_id') is-invalid @enderror" required>
                                             <option disabled selected>Select Calendar</option>
                                             @foreach ($calendars as $calendar)
                                                 @can('view', $calendar)
@@ -31,8 +31,8 @@
                                                 @endcan
                                             @endforeach
                                         </select>
-                                        @error('calendar')
-                                            <span class="text-danger">{{ $errors->first('calendar') }}</span>
+                                        @error('calendar_id')
+                                            <span class="text-danger">{{ $errors->first('calendar_id') }}</span>
                                         @enderror
                                     </div>
 
@@ -89,21 +89,20 @@
                                     <hr class="my-4">
 
                                     <div class="form-check">
-                                        <input class="form-check-input" type="radio" name="event_type" id="standard_event" value="2" {{ old('event_type') == 1 || old('event_type') == null ? 'checked' : '' }}>
+                                        <input class="form-check-input" type="radio" name="event_type" id="standard_event" value="0" {{ old('event_type') == 0 ? 'checked' : '' }}>
                                         <label class="form-check-label" for="standard_event">
                                           Standard Event
                                         </label>
                                     </div>
 
                                     <div class="form-check mb-4">
-                                        <input type="hidden" name="event_type" value="0">
-                                        <input class="form-check-input" type="radio" name="event_type" id="is_recurring" value="1" data-toggle="collapse" data-target="#recurringOptions" aria-expanded="false" aria-controls="recurringOptions" {{ old('recurrence_interval') != null && old('recurrence_unit') != null ? 'checked' : '' }}>
+                                        <input class="form-check-input" type="radio" name="event_type" id="is_recurring" value="1" data-toggle="collapse" data-target="#recurringOptions" aria-expanded="false" aria-controls="recurringOptions" {{ old('event_type') == 1 ? 'checked' : '' }}>
                                         <label class="form-check-label" for="is_recurring">
                                             Recurring Event
                                         </label>
                                     </div>
                                     
-                                    <div id="recurringOptions" class="collapse col-xs-12 col-sm-12 col-md-12 mb-2">
+                                    <div id="recurringOptions" class="collapse col-xs-12 col-sm-12 col-md-12 mb-2 {{ old('event_type') == 1 ? 'show' : '' }}">
                                         <div class="col-xs-12 col-sm-12 col-md-12 mb-2">
                                             <div class="form-group">
                                                 <label for="recurrence_unit" class="form-label my-1 me-2">Recurrence Type</label>
diff --git a/resources/views/events/edit.blade.php b/resources/views/events/edit.blade.php
index f18e578..726a7fa 100644
--- a/resources/views/events/edit.blade.php
+++ b/resources/views/events/edit.blade.php
@@ -24,7 +24,7 @@
 
                                     <div class="form-group mb-4">
                                         <label for="calendar" class="form-label my-1 me-2">Calendar</label>
-                                        <select name="calendar_id" id="calendar" class="form-control my-1 me-sm-2 @error('calendar') is-invalid @enderror" required>
+                                        <select name="calendar_id" id="calendar" class="form-control my-1 me-sm-2 @error('calendar_id') is-invalid @enderror" required>
                                             <option disabled>Select Calendar</option>
                                             @foreach ($calendars as $calendar)
                                                 @can('view', $calendar)
@@ -32,8 +32,8 @@
                                                 @endcan
                                             @endforeach
                                         </select>
-                                        @error('calendar')
-                                            <span class="text-danger">{{ $errors->first('calendar') }}</span>
+                                        @error('calendar_id')
+                                            <span class="text-danger">{{ $errors->first('calendar_id') }}</span>
                                         @enderror
                                     </div>
 
@@ -93,7 +93,7 @@
                                     <hr class="my-4">
 
                                     <div class="form-check">
-                                        <input class="form-check-input" type="radio" name="event_type" id="standard_event" value="2" {{ $event->recurrence_interval != 1 ? 'checked' : '' }}>
+                                        <input class="form-check-input" type="radio" name="event_type" id="standard_event" value="2" {{ $event->recurrence_interval == null ? 'checked' : '' }}>
                                         <label class="form-check-label" for="standard_event">
                                           Standard Event
                                         </label>
@@ -107,7 +107,7 @@
                                         </label>
                                     </div>
                                     
-                                    <div id="recurringOptions" class="collapse col-xs-12 col-sm-12 col-md-12 mb-2">
+                                    <div id="recurringOptions" class="collapse col-xs-12 col-sm-12 col-md-12 mb-2 {{ $event->recurrence_interval != null && $event->recurrence_unit != null ? 'show' : '' }}">
                                         <div class="col-xs-12 col-sm-12 col-md-12 mb-2">
                                             <div class="form-group">
                                                 <label for="recurrence_unit" class="form-label my-1 me-2">Recurrence Type</label>
diff --git a/resources/views/events/index.blade.php b/resources/views/events/index.blade.php
index ab422db..4bc3801 100644
--- a/resources/views/events/index.blade.php
+++ b/resources/views/events/index.blade.php
@@ -41,8 +41,11 @@
                                             <td>{{ \Carbon\Carbon::parse($event->start_date)->format('d-m-Y H:i') }}z</td>
                                             <td>{{ \Carbon\Carbon::parse($event->end_date)->format('d-m-Y H:i') }}z</td>
                                             <td class="text-center text-white">
-                                                @if ($event->parent_id != null && $event->recurrence_interval != null) 
-                                                    <a href="{{ route('events.edit', $event->parent) }}">{{ $event->parent->title }}</a>
+                                                @if ($event->children->isNotEmpty())
+                                                    <p class="text-success mb-0">Parent</p>
+                                                @elseif($event->parent_id != null)
+                                                    <a href="{{ route('events.edit', $event->parent) }}" class="flex-grow-1">{{ $event->parent->title }}</a>
+                                                    <p class="text-muted mt-auto">Id: {{ $event->parent_id }}</p>
                                                 @endif
                                             </td>
                                             <td>
@@ -55,7 +58,7 @@
                                                         onsubmit="return confirm('Are you sure you want to delete this event? - {{ $event->title }}')">
                                                         @method('DELETE')
                                                         @csrf
-                                                        <button class="btn btn-sm btn-danger" type="submit"><i class="fas fa-trash" aria-hidden="true"></i> Delete</button>
+                                                        <button class="btn btn-sm btn-danger" type="submit"><i class="fas fa-trash" aria-hidden="true"></i> Delete @if ($event->children->isNotEmpty()) all recurring  @elseif($event->parent_id != null) occurance @endif</button>
                                                     </form>
                                                 @endcan
                                             </td>
diff --git a/resources/views/events/show.blade.php b/resources/views/events/show.blade.php
index 98cccce..5a93e14 100644
--- a/resources/views/events/show.blade.php
+++ b/resources/views/events/show.blade.php
@@ -27,7 +27,7 @@
             </div>
             <div>
                 <i class="fas fa-calendar-alt"></i>
-                <strong>Recurrence End Date:</strong> {{ \Carbon\Carbon::parse($event->recurrence_end_date)->format('F j, Y, H:i') }}z
+                <strong>Recurrence End Date:</strong> {{ \Carbon\Carbon::parse($event->recurrence_end_date)->format('F j, Y') }}z
             </div>
         @endif