diff --git a/calendar_event_add_modal.php b/calendar_event_add_modal.php
index 6b14e997..f7dfdac1 100644
--- a/calendar_event_add_modal.php
+++ b/calendar_event_add_modal.php
@@ -14,6 +14,9 @@
                         <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-details"><i class="fa fa-fw fa-info-circle mr-2"></i>Details</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>
@@ -93,8 +96,22 @@
                                 </div>
                             </div>
 
+                        </div>
+
+                        <div class="tab-pane fade" id="pills-details">
+
                             <div class="form-group">
-                                <textarea class="form-control" rows="5" name="description" placeholder="Enter a description"></textarea>
+                                <label>Location</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="location" placeholder="Location of the event">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <textarea class="form-control" rows="8" name="description" placeholder="Enter a description"></textarea>
                             </div>
 
                         </div>
diff --git a/calendar_event_edit_modal.php b/calendar_event_edit_modal.php
index 99eb0207..89769ad4 100644
--- a/calendar_event_edit_modal.php
+++ b/calendar_event_edit_modal.php
@@ -17,6 +17,9 @@
                         <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-details<?php echo $event_id; ?>"><i class="fa fa-fw fa-info-circle mr-2"></i>Details</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>
@@ -60,7 +63,6 @@
                                 </div>
                             </div>
 
-                            
                             <div class="form-group">
                                 <label>Start / End <strong class="text-danger">*</strong></label>
                                 <div class="input-group">
@@ -94,17 +96,25 @@
                                         <option <?php if ($event_repeat == "Year") { echo "selected"; } ?>>Year</option>
                                     </select>
                                 </div>
+                            </div>  
+
+                        </div>
+
+                        <div class="tab-pane fade" id="pills-details<?php echo $event_id; ?>">
+                            <div class="form-group">
+                                <label>Location</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="location" value="<?php echo $event_location; ?>" placeholder="Location of the event">
+                                </div>
                             </div>
 
                             <div class="form-group">
                                 <label>Description</label>
-                                <textarea class="form-control" rows="5" name="description" placeholder="Enter a description"><?php echo $event_description; ?></textarea>
+                                <textarea class="form-control" rows="8" 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>
diff --git a/calendar_events.php b/calendar_events.php
index 65856d1e..52a29a4b 100644
--- a/calendar_events.php
+++ b/calendar_events.php
@@ -32,6 +32,7 @@ while ($row = mysqli_fetch_array($sql)) {
     $event_id = intval($row['event_id']);
     $event_title = nullable_htmlentities($row['event_title']);
     $event_description = nullable_htmlentities($row['event_description']);
+    $event_location = nullable_htmlentities($row['event_location']);
     $event_start = nullable_htmlentities($row['event_start']);
     $event_end = nullable_htmlentities($row['event_end']);
     $event_repeat = nullable_htmlentities($row['event_repeat']);
diff --git a/client_events.php b/client_events.php
index 41ae75ff..fe18fb5c 100644
--- a/client_events.php
+++ b/client_events.php
@@ -34,6 +34,7 @@ while ($row = mysqli_fetch_array($sql)) {
     $event_id = intval($row['event_id']);
     $event_title = nullable_htmlentities($row['event_title']);
     $event_description = nullable_htmlentities($row['event_description']);
+    $event_location = nullable_htmlentities($row['event_location']);
     $event_start = nullable_htmlentities($row['event_start']);
     $event_end = nullable_htmlentities($row['event_end']);
     $event_repeat = nullable_htmlentities($row['event_repeat']);
diff --git a/post/event.php b/post/event.php
index aa729f8d..831a2839 100644
--- a/post/event.php
+++ b/post/event.php
@@ -27,7 +27,7 @@ if (isset($_POST['add_event'])) {
     require_once 'post/event_model.php';
 
 
-    mysqli_query($mysqli,"INSERT INTO events SET event_title = '$title', event_description = '$description', event_start = '$start', event_end = '$end', event_repeat = '$repeat', event_calendar_id = $calendar_id, event_client_id = $client");
+    mysqli_query($mysqli,"INSERT INTO events SET event_title = '$title', event_location = '$location', event_description = '$description', event_start = '$start', event_end = '$end', event_repeat = '$repeat', event_calendar_id = $calendar_id, event_client_id = $client");
 
     $event_id = mysqli_insert_id($mysqli);
 
@@ -103,7 +103,7 @@ if (isset($_POST['edit_event'])) {
 
     $event_id = intval($_POST['event_id']);
 
-    mysqli_query($mysqli,"UPDATE events SET event_title = '$title', event_description = '$description', event_start = '$start', event_end = '$end', event_repeat = '$repeat', event_calendar_id = $calendar_id, event_client_id = $client WHERE event_id = $event_id");
+    mysqli_query($mysqli,"UPDATE events SET event_title = '$title', event_location = '$location', event_description = '$description', event_start = '$start', event_end = '$end', event_repeat = '$repeat', event_calendar_id = $calendar_id, event_client_id = $client WHERE event_id = $event_id");
 
     //If email is checked
     if ($email_event == 1) {
diff --git a/post/event_model.php b/post/event_model.php
index a55272c5..d3f39b6d 100644
--- a/post/event_model.php
+++ b/post/event_model.php
@@ -1,6 +1,7 @@
 <?php
 $calendar_id = intval($_POST['calendar']);
 $title = sanitizeInput($_POST['title']);
+$location = sanitizeInput($_POST['location']);
 $description = sanitizeInput($_POST['description']);
 $start = sanitizeInput($_POST['start']);
 $end = sanitizeInput($_POST['end']);