diff --git a/calendar_event_add_modal.php b/calendar_event_add_modal.php
index 9b7ad916..6b14e997 100644
--- a/calendar_event_add_modal.php
+++ b/calendar_event_add_modal.php
@@ -14,9 +14,6 @@
                         <li class="nav-item">
                             <a class="nav-link active" data-toggle="pill" href="#pills-event"><i class="fa fa-fw fa-calendar mr-2"></i>Event</a>
                         </li>
-                        <li class="nav-item">
-                            <a class="nav-link" data-toggle="pill" href="#pills-more"><i class="fa fa-fw fa-info-circle mr-2"></i>More</a>
-                        </li>
                         <li class="nav-item">
                             <a class="nav-link" data-toggle="pill" href="#pills-attendees"><i class="fa fa-fw fa-users mr-2"></i>Attendees</a>
                         </li>
@@ -61,24 +58,24 @@
                                 </div>
                             </div>
 
-                            <label>Start / End <strong class="text-danger">*</strong></label>
-                            <div class="form-row">
-                                <div class="col-md-6 mb-3">
-                                    <input type="datetime-local" class="form-control form-control-sm" id="event_add_start" name="start" required onblur="updateIncrementEndTime()">
-                                </div>
-                                <div class="col-md-6 mb-3">
-                                    <input type="datetime-local" class="form-control form-control-sm" id="event_add_end" name="end" required>
-                                </div>
-                            </div>
-
                             <div class="form-group">
-                                <label>Description</label>
-                                <textarea class="form-control" rows="4" name="description" placeholder="Enter a description"></textarea>
+                                <label>Start / End <strong class="text-danger">*</strong></label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-calendar-check"></i></span>
+                                    </div>
+                                    <input type="datetime-local" class="form-control" id="event_add_start" name="start" required onblur="updateIncrementEndTime()">
+                                </div>
+                            </div>
+                            
+                            <div class="form-group">
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
+                                    </div>
+                                    <input type="datetime-local" class="form-control" id="event_add_end" name="end" required>
+                                </div>
                             </div>
-
-                        </div>
-
-                        <div class="tab-pane fade" id="pills-more">
 
                             <div class="form-group">
                                 <label>Repeat</label>
@@ -96,6 +93,10 @@
                                 </div>
                             </div>
 
+                            <div class="form-group">
+                                <textarea class="form-control" rows="5" name="description" placeholder="Enter a description"></textarea>
+                            </div>
+
                         </div>
 
                         <div class="tab-pane fade" id="pills-attendees">
diff --git a/calendar_event_edit_modal.php b/calendar_event_edit_modal.php
index 01b46cce..3eee42a7 100644
--- a/calendar_event_edit_modal.php
+++ b/calendar_event_edit_modal.php
@@ -17,9 +17,6 @@
                         <li class="nav-item">
                             <a class="nav-link active" data-toggle="pill" href="#pills-event<?php echo $event_id; ?>"><i class="fa fa-fw fa-calendar mr-2"></i>Event</a>
                         </li>
-                        <li class="nav-item">
-                            <a class="nav-link" data-toggle="pill" href="#pills-more<?php echo $event_id; ?>"><i class="fa fa-fw fa-info-circle mr-2"></i>More</a>
-                        </li>
                         <li class="nav-item">
                             <a class="nav-link" data-toggle="pill" href="#pills-attendees<?php echo $event_id; ?>"><i class="fa fa-fw fa-users mr-2"></i>Attendees</a>
                         </li>
@@ -63,24 +60,25 @@
                                 </div>
                             </div>
 
-                            <label>Start / End <strong class="text-danger">*</strong></label>
-                            <div class="form-row">
-                                <div class="col-md-6 mb-3">
-                                    <input type="datetime-local" class="form-control form-control-sm" name="start" value="<?php echo date('Y-m-d\TH:i:s', strtotime($event_start)); ?>" required>
-                                </div>
-                                <div class="col-md-6 mb-3">
-                                    <input type="datetime-local" class="form-control form-control-sm" name="end" value="<?php echo date('Y-m-d\TH:i:s', strtotime($event_end)); ?>"required>
-                                </div>
-                            </div>
-
+                            
                             <div class="form-group">
-                                <label>Description</label>
-                                <textarea class="form-control" rows="4" name="description" placeholder="Enter a description"><?php echo $event_description; ?></textarea>
+                                <label>Start / End <strong class="text-danger">*</strong></label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-calendar-check"></i></span>
+                                    </div>
+                                    <input type="datetime-local" class="form-control" name="start" value="<?php echo date('Y-m-d\TH:i:s', strtotime($event_start)); ?>" required>
+                                </div>
+                            </div>
+                                
+                            <div class="form-group">
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-calendar-day"></i></span>
+                                    </div>
+                                    <input type="datetime-local" class="form-control" name="end" value="<?php echo date('Y-m-d\TH:i:s', strtotime($event_end)); ?>"required>
+                                </div>
                             </div>
-
-                        </div>
-
-                        <div class="tab-pane fade" id="pills-more<?php echo $event_id; ?>">
 
                             <div class="form-group">
                                 <label>Repeat</label>
@@ -98,6 +96,17 @@
                                 </div>
                             </div>
 
+                            <div class="form-group">
+                                <label>Description</label>
+                                <textarea class="form-control" rows="4" name="description" placeholder="Enter a description"><?php echo $event_description; ?></textarea>
+                            </div>
+
+                        </div>
+
+                        <div class="tab-pane fade" id="pills-more<?php echo $event_id; ?>">
+
+                            
+
                         </div>
 
                         <div class="tab-pane fade" id="pills-attendees<?php echo $event_id; ?>">