diff --git a/client.php b/client.php
index 663d03a7..506e889c 100644
--- a/client.php
+++ b/client.php
@@ -96,6 +96,12 @@ if(isset($_GET['client_id'])){
   $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('note_id') AS num FROM notes WHERE client_id = $client_id"));
   $num_notes = $row['num'];
 
+  $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('event_id') AS num FROM events WHERE client_id = $client_id"));
+  $num_events = $row['num'];
+
+  $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('trip_id') AS num FROM trips WHERE client_id = $client_id"));
+  $num_trips = $row['num'];
+
 ?>
 
 <?php include("header.php"); ?>
diff --git a/client_add_calendar_event_modal.php b/client_add_calendar_event_modal.php
new file mode 100644
index 00000000..d5f08985
--- /dev/null
+++ b/client_add_calendar_event_modal.php
@@ -0,0 +1,80 @@
+<div class="modal" id="addCalendarEventModal" tabindex="-1">
+  <div class="modal-dialog">
+    <div class="modal-content bg-dark">
+      <div class="modal-header text-white">
+        <h5 class="modal-title"><i class="fa fa-fw fa-calendar-plus mr-2"></i>New Event</h5>
+        <button type="button" class="close text-white" data-dismiss="modal">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <form action="post.php" method="post" autocomplete="off">
+        <input type="hidden" name="client" value="<?php echo $client_id; ?>">
+        <div class="modal-body bg-white">
+          <div class="form-group">
+            <label>Title <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-angle-right"></i></span>
+              </div>
+              <input type="text" class="form-control" name="title" placeholder="Title of the event" required autofocus>
+            </div>
+          </div>
+          <div class="form-group">
+            <label>Calendar <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"></i></span>
+              </div>
+              <select class="form-control selectpicker show-tick" name="calendar" required>
+                <option value="">- Calendar -</option>
+                <?php 
+                
+                $sql = mysqli_query($mysqli,"SELECT * FROM calendars WHERE company_id = $session_company_id"); 
+                while($row = mysqli_fetch_array($sql)){
+                  $calendar_id = $row['calendar_id'];
+                  $calendar_name = $row['calendar_name'];
+                  $calendar_color = $row['calendar_color'];
+                ?>
+                  <option <?php if($config_default_calendar == $calendar_id){ echo "selected"; } ?> data-content="<i class='fa fa-circle mr-2' style='color:<?php echo $calendar_color; ?>;'></i> <?php echo $calendar_name; ?>" value="<?php echo $calendar_id; ?>"><?php echo $calendar_name; ?></option>
+                
+                <?php
+                }
+                ?>
+              </select>
+            </div>
+          </div>
+          
+          <div class="form-group">
+            <label>Starts <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-clock"></i></span>
+              </div>
+              <input type="datetime-local" class="form-control" name="start" required>
+            </div>
+          </div>
+          
+          <div class="form-group">
+            <label>Ends <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-stopwatch"></i></span>
+              </div>
+              <input type="datetime-local" class="form-control" name="end" required>
+            </div>
+          </div>
+
+          <div class="custom-control custom-checkbox">
+            <input type="checkbox" class="custom-control-input" id="customControlAutosizing" name="email_event" value="1" >
+            <label class="custom-control-label" for="customControlAutosizing">Email Event</label>
+          </div>
+
+        </div>
+        <div class="modal-footer bg-white">
+          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
+          <button type="submit" name="add_event" class="btn btn-primary">Save</button>
+        </div>
+      </form>
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/client_add_trip_copy_modal.php b/client_add_trip_copy_modal.php
new file mode 100644
index 00000000..51679116
--- /dev/null
+++ b/client_add_trip_copy_modal.php
@@ -0,0 +1,75 @@
+<div class="modal" id="addTripCopyModal<?php echo $trip_id; ?>" tabindex="-1">
+  <div class="modal-dialog">
+    <div class="modal-content bg-dark">
+      <div class="modal-header">
+        <h5 class="modal-title text-white"><i class="fa fa-fw fa-bicycle mr-2"></i>Copy Trip</h5>
+        <button type="button" class="close text-white" data-dismiss="modal">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <form action="post.php" method="post" autocomplete="off">
+        <input type="hidden" name="client" value="<?php echo $client_id; ?>">
+        <div class="modal-body bg-white">
+
+          <div class="form-row">
+            
+            <div class="form-group col">
+              <label>Date <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"></i></span>
+                </div>
+                <input type="date" class="form-control" name="date" required>
+              </div>
+            </div>
+
+            <div class="form-group col">
+              <label>Miles <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-bicycle"></i></span>
+                </div>
+                <input type="number" step="0.1" min="0" class="form-control" name="miles" value="<?php echo $trip_miles; ?>" required>
+              </div>
+            </div>
+          
+          </div>
+
+          <div class="form-group">
+            <label>Location <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+              <div class="input-group-prepend">
+                <span class="input-group-text"><i class="fa fa-map-marker-alt"></i></span>
+              </div>
+              <input type="text" class="form-control" name="starting_location" value="<?php echo $trip_starting_location; ?>" 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-arrow-right"></i></span>
+              </div>
+              <input type="text" class="form-control" name="destination" value="<?php echo $trip_destination; ?>" required>
+            </div>
+          </div>
+          
+          <div class="form-group">
+            <label>Purpose <strong class="text-danger">*</strong></label>
+            <textarea rows="4" class="form-control" name="purpose" required><?php echo $trip_purpose; ?></textarea>
+          </div>
+
+          <div class="custom-control custom-checkbox">
+            <input type="checkbox" class="custom-control-input" id="customControlAutosizingCopy<?php echo $trip_id; ?>" name="roundtrip" value="1" >
+            <label class="custom-control-label" for="customControlAutosizingCopy<?php echo $trip_id; ?>">Round Trip</label>
+          </div>
+        
+        </div>
+        <div class="modal-footer bg-white">
+          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
+          <button type="submit" name="add_trip" class="btn btn-primary">Save</button>
+        </div>
+      </form>
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/client_add_trip_modal.php b/client_add_trip_modal.php
new file mode 100644
index 00000000..8c543591
--- /dev/null
+++ b/client_add_trip_modal.php
@@ -0,0 +1,69 @@
+<div class="modal" id="addTripModal" tabindex="-1">
+  <div class="modal-dialog">
+    <div class="modal-content bg-dark">
+      <div class="modal-header text-white">
+        <h5 class="modal-title"><i class="fa fa-fw fa-bicycle mr-2"></i>New Trip</h5>
+        <button type="button" class="close text-white" data-dismiss="modal">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <form action="post.php" method="post" autocomplete="off">
+        <input type="hidden" name="client" value="<?php echo $client_id; ?>">
+        <div class="modal-body bg-white">
+
+          <div class="form-row">
+            <div class="form-group col">
+              <label>Date <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"></i></span>
+                </div>
+                <input type="date" class="form-control" name="date" value="<?php echo date("Y-m-d"); ?>" required>
+              </div>
+            </div>
+            <div class="form-group col">
+              <label>Miles <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-bicycle"></i></span>
+                </div>
+                <input type="number" step="0.1" min="0" class="form-control" name="miles" placeholder="Enter miles" required autofocus>
+              </div>
+            </div>
+          </div>
+          <div class="form-group">
+            <label>Location <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-map-marker-alt"></i></span>
+              </div>
+              <input type="text" class="form-control" name="starting_location" placeholder="Enter your starting location" 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-arrow-right"></i></span>
+              </div>
+              <input type="text" class="form-control" name="destination" placeholder="Enter your destination" required>
+            </div>
+          </div>
+          <div class="form-group">
+            <label>Purpose <strong class="text-danger">*</strong></label>
+            <textarea rows="4" class="form-control" name="purpose" required></textarea>
+          </div>
+          <div class="custom-control custom-checkbox">
+            <input type="checkbox" class="custom-control-input" id="customControlAutosizing" name="roundtrip" value="1" >
+            <label class="custom-control-label" for="customControlAutosizing">Round Trip</label>
+          </div>
+        
+        </div>
+        
+        <div class="modal-footer bg-white">
+          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
+          <button type="submit" name="add_trip" class="btn btn-primary">Save</button>
+        </div>
+      </form>
+    </div> <!-- Modal Content -->
+  </div> <!-- Modal Dialog -->
+</div> <!-- Modal -->
\ No newline at end of file
diff --git a/client_edit_calendar_event_modal.php b/client_edit_calendar_event_modal.php
new file mode 100644
index 00000000..65d67921
--- /dev/null
+++ b/client_edit_calendar_event_modal.php
@@ -0,0 +1,80 @@
+<div class="modal" id="editEventModal<?php echo $event_id; ?>" tabindex="-1">
+  <div class="modal-dialog">
+    <div class="modal-content bg-dark">
+      <div class="modal-header">
+        <h5 class="modal-title text-white"><i class="fa fa-fw fa-calendar mr-2"></i><?php echo $event_title; ?></h5>
+        <button type="button" class="close text-white" data-dismiss="modal">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <form action="post.php" method="post" autocomplete="off">
+        <input type="hidden" name="event_id" value="<?php echo $event_id; ?>">
+        <input type="hidden" name="client" value="<?php echo $client_id; ?>">
+        <div class="modal-body bg-white">
+          <p></p>
+          <div class="form-group">
+            <label>Title <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-angle-right"></i></span>
+              </div>
+              <input type="text" class="form-control" name="title" value="<?php echo $event_title; ?>" placeholder="Title of the event" required>
+            </div>
+          </div>
+          <div class="form-group">
+            <label>Calendar <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+              <div class="input-group-prepend">
+                <span class="input-group-text"><i class="fa fa-calendar"></i></span>
+              </div>
+              <select class="form-control selectpicker show-tick" name="calendar" required>
+                <?php 
+                
+                $sql_calendars_select = mysqli_query($mysqli,"SELECT * FROM calendars WHERE company_id = $session_company_id"); 
+                while($row = mysqli_fetch_array($sql_calendars_select)){
+                  $calendar_id_select = $row['calendar_id'];
+                  $calendar_name_select = $row['calendar_name'];
+                  $calendar_color_select = $row['calendar_color'];
+                ?>
+                  <option data-content="<i class='fa fa-circle mr-2' style='color:<?php echo $calendar_color_select; ?>;'></i> <?php echo $calendar_name_select; ?>"<?php if($calendar_id == $calendar_id_select){ echo "selected"; } ?> value="<?php echo $calendar_id_select; ?>"><?php echo $calendar_name_select; ?></option>
+                
+                <?php
+                }
+                ?>
+              </select>
+            </div>
+          </div>
+          <div class="form-group">
+            <label>Starts <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-clock"></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">
+            <label>Ends <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-stopwatch"></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 class="custom-control custom-checkbox">
+            <input type="checkbox" class="custom-control-input" id="customControlAutosizing<?php echo $event_id; ?>" name="email_event" value="1" >
+            <label class="custom-control-label" for="customControlAutosizing<?php echo $event_id; ?>">Email Event</label>
+          </div>
+
+        </div>
+        <div class="modal-footer bg-white">
+          <a href="post.php?delete_event=<?php echo $event_id; ?>" class="btn btn-outline-danger mr-auto">Delete</a>
+          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
+          <button type="submit" name="edit_event" class="btn btn-primary">Save</button>
+        </div>
+      </form>
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/client_edit_trip_modal.php b/client_edit_trip_modal.php
new file mode 100644
index 00000000..1f7a0757
--- /dev/null
+++ b/client_edit_trip_modal.php
@@ -0,0 +1,76 @@
+<div class="modal" id="editTripModal<?php echo $trip_id; ?>" tabindex="-1">
+  <div class="modal-dialog">
+    <div class="modal-content bg-dark">
+      <div class="modal-header">
+        <h5 class="modal-title text-white"><i class="fa fa-fw fa-bicycle mr-2"></i>Edit Trip</h5>
+        <button type="button" class="close text-white" data-dismiss="modal">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <form action="post.php" method="post" autocomplete="off">
+        <input type="hidden" name="trip_id" value="<?php echo $trip_id; ?>">
+        <input type="hidden" name="client" value="<?php echo $client_id; ?>">
+        <div class="modal-body bg-white">
+    
+          <div class="form-row">
+            
+            <div class="form-group col">
+              <label>Date <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"></i></span>
+                </div>
+                <input type="date" class="form-control" name="date" value="<?php echo $trip_date; ?>" required>
+              </div>
+            </div>
+            
+            <div class="form-group col">
+              <label>Miles <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-bicycle"></i></span>
+                </div>
+                <input type="number" step="0.1" min="0" class="form-control" name="miles" value="<?php echo $trip_miles; ?>" required>
+              </div>
+            </div>
+
+          </div>
+      
+          <div class="form-group">
+            <label>Location <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+              <div class="input-group-prepend">
+                <span class="input-group-text"><i class="fa fa-map-marker-alt"></i></span>
+              </div>
+              <input type="text" class="form-control" name="starting_location" value="<?php echo $trip_starting_location; ?>" 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-arrow-right"></i></span>
+              </div>
+              <input type="text" class="form-control" name="destination" value="<?php echo $trip_destination; ?>" required>
+            </div>
+          </div>
+          
+          <div class="form-group">
+            <label>Purpose <strong class="text-danger">*</strong></label>
+            <textarea rows="4" class="form-control" name="purpose" required><?php echo $trip_purpose; ?></textarea>
+          </div>
+
+          <div class="custom-control custom-checkbox">
+            <input type="checkbox" <?php if($round_trip == 1){ echo "checked"; } ?> class="custom-control-input" id="customControlAutosizing<?php echo $trip_id; ?>" name="roundtrip" value="1" >
+            <label class="custom-control-label" for="customControlAutosizing<?php echo $trip_id; ?>">Round Trip</label>
+          </div>
+
+        </div>
+        <div class="modal-footer bg-white">
+          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
+          <button type="submit" name="edit_trip" class="btn btn-primary">Save</button>
+        </div>
+      </form>
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/client_events.php b/client_events.php
index a73067f5..a4e35cc0 100644
--- a/client_events.php
+++ b/client_events.php
@@ -1,5 +1,3 @@
-<?php include("header.php"); ?>
-
 <?php 
 
 if(isset($_GET['calendar_id'])){
@@ -8,12 +6,30 @@ if(isset($_GET['calendar_id'])){
 
 ?>
 
-<div id='calendar'></div>
+<div class="card"><?php echo $client_id; ?>
+  <div id='calendar'></div>
+</div>
 
-<?php include("add_calendar_event_modal.php"); ?>
-<?php include("edit_calendar_event_modal.php"); ?>
+<?php include("client_add_calendar_event_modal.php"); ?>
+<?php include("add_calendar_modal.php"); ?>
 
-<?php include("footer.php"); ?>
+<?php
+//loop through IDs and create a modal for each
+$sql = mysqli_query($mysqli,"SELECT * FROM events, calendars WHERE events.calendar_id = calendars.calendar_id AND events.client_id = $client_id AND calendars.company_id = $session_company_id");
+while($row = mysqli_fetch_array($sql)){
+  $event_id = $row['event_id'];
+  $event_title = $row['event_title'];
+  $event_start = $row['event_start'];
+  $event_end = $row['event_end'];
+  $calendar_id = $row['calendar_id'];
+  $calendar_name = $row['calendar_name'];
+  $calendar_color = $row['calendar_color'];
+
+  include("client_edit_calendar_event_modal.php");
+
+}
+
+?>
 
 <script>
 
@@ -21,25 +37,31 @@ if(isset($_GET['calendar_id'])){
       var calendarEl = document.getElementById('calendar');
 
       var calendar = new FullCalendar.Calendar(calendarEl, {
-        plugins: [ 'interaction', 'dayGrid', 'timeGrid', 'list' ],
+        plugins: [ 'bootstrap', 'dayGrid', 'timeGrid', 'list' ],
+        themeSystem: 'bootstrap',
         defaultView: 'dayGridMonth',
         customButtons: {
-          myCustomButton: {
-            text: 'New',
+          addEvent: {
+            bootstrapFontAwesome: 'fa fa-plus',
             click: function() {
-              $("#addCalendarEventModal").modal("show");
+              $("#addCalendarEventModal").modal();
+            }
+          },
+          addCalendar: {
+            bootstrapFontAwesome: 'fa fa-calendar-plus',
+            click: function() {
+              $("#addCalendarModal").modal();
             }
           }
         },
         header: {
           left: 'prev,next today',
           center: 'title',
-          right: 'dayGridMonth,timeGridWeek,timeGridDay,listMonth myCustomButton'
+          right: 'dayGridMonth,timeGridWeek,timeGridDay,listMonth addEvent addCalendar '
         },
-        
         events: [
           <?php
-          $sql = mysqli_query($mysqli,"SELECT * FROM events");
+          $sql = mysqli_query($mysqli,"SELECT * FROM events, calendars WHERE events.calendar_id = calendars.calendar_id AND calendars.company_id = $session_company_id AND events.client_id = $client_id");
           while($row = mysqli_fetch_array($sql)){
             $event_id = $row['event_id'];
             $event_title = $row['event_title'];
@@ -47,16 +69,15 @@ if(isset($_GET['calendar_id'])){
             $event_end = $row['event_end'];
             $calendar_id = $row['calendar_id'];
             $calendar_name = $row['calendar_name'];
-            echo "{ id: '$event_id', title: '$event_title', start: '$event_start'},";
+            $calendar_color = $row['calendar_color'];
+            
+            echo "{ id: '$event_id', title: '$event_title', start: '$event_start', end: '$event_end', color: '$calendar_color'},";
           }
           ?>
         ],
-        eventClick:  function(event, jsEvent, view) {
-            $('#modalTitle').html(event.title);
-            $('#modalBody').html(event.description);
-            $('#eventUrl').attr('href',event.url);
-            $('#editEventModal').modal();
-        },
+        eventClick: function(editEvent) {
+          $('#editEventModal'+editEvent.event.id).modal();
+        }
       });
 
       calendar.render();
diff --git a/client_routes.php b/client_routes.php
index 87141293..e471f021 100644
--- a/client_routes.php
+++ b/client_routes.php
@@ -40,6 +40,12 @@ if(isset($_GET['tab'])){
   elseif($_GET['tab'] == "quotes"){
     include("client_quotes.php");
   }
+  elseif($_GET['tab'] == "trips"){
+    include("client_trips.php");
+  }
+  elseif($_GET['tab'] == "events"){
+    include("client_events.php");
+  }
   elseif($_GET['tab'] == "files"){
     include("client_files.php");
   }
diff --git a/client_side_nav.php b/client_side_nav.php
index ee4daec4..195cbb0c 100644
--- a/client_side_nav.php
+++ b/client_side_nav.php
@@ -197,6 +197,32 @@
 
         <li class="nav-header">MORE</li>
 
+        <li class="nav-item">
+          <a href="?client_id=<?php echo $client_id; ?>&tab=trips" class="nav-link <?php if($_GET['tab'] == "trips") { echo "active"; } ?>">
+            <i class="nav-icon fas fa-bicycle"></i>
+            <p>
+              Trips
+              <?php 
+              if($num_trips > 0){ ?>
+              <span class="right badge badge-light"><?php echo $num_trips; ?></span>
+              <?php } ?>
+            </p>
+          </a>
+        </li>
+
+        <li class="nav-item">
+          <a href="?client_id=<?php echo $client_id; ?>&tab=events" class="nav-link <?php if($_GET['tab'] == "events") { echo "active"; } ?>">
+            <i class="nav-icon fas fa-calendar"></i>
+            <p>
+              Events
+              <?php 
+              if($num_events > 0){ ?>
+              <span class="right badge badge-light"><?php echo $num_events; ?></span>
+              <?php } ?>
+            </p>
+          </a>
+        </li>
+
         <li class="nav-item">
           <a href="?client_id=<?php echo $client_id; ?>&tab=files" class="nav-link <?php if($_GET['tab'] == "files") { echo "active"; } ?>">
             <i class="nav-icon fas fa-paperclip"></i>
diff --git a/client_trips.php b/client_trips.php
new file mode 100644
index 00000000..711ed8dc
--- /dev/null
+++ b/client_trips.php
@@ -0,0 +1,156 @@
+<?php
+
+//Rebuild URL
+
+$url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
+
+if(isset($_GET['p'])){
+  $p = intval($_GET['p']);
+  $record_from = (($p)-1)*10;
+  $record_to =  10;
+}else{
+  $record_from = 0;
+  $record_to = 10;
+  $p = 1;
+}
+  
+if(isset($_GET['q'])){
+  $q = mysqli_real_escape_string($mysqli,$_GET['q']);
+}else{
+  $q = "";
+}
+
+if(!empty($_GET['sb'])){
+  $sb = mysqli_real_escape_string($mysqli,$_GET['sb']);
+}else{
+  $sb = "trip_id";
+}
+
+if(isset($_GET['o'])){
+  if($_GET['o'] == 'ASC'){
+    $o = "ASC";
+    $disp = "DESC";
+  }else{
+    $o = "DESC";
+    $disp = "ASC";
+  }
+}else{
+  $o = "DESC";
+  $disp = "ASC";
+}
+
+//Date From and Date To Filter
+if(isset($_GET['dtf'])){
+  $dtf = $_GET['dtf'];
+  $dtt = $_GET['dtt'];
+}else{
+  $dtf = "0000-00-00";
+  $dtt = "9999-00-00";
+}
+
+$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM trips  
+  WHERE (trip_purpose LIKE '%$q%' OR trip_starting_location LIKE '%$q%' OR trip_destination LIKE '%$q%')
+  AND DATE(trip_date) BETWEEN '$dtf' AND '$dtt'
+  AND company_id = $session_company_id
+  AND client_id = $client_id
+  ORDER BY $sb $o LIMIT $record_from, $record_to");
+
+$num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
+$total_found_rows = $num_rows[0];
+$total_pages = ceil($total_found_rows / 10);
+
+?>
+
+<div class="card mb-3">
+  <div class="card-header bg-dark text-white">
+    <h6 class="float-left mt-1"><i class="fa fa-fw fa-bicycle mr-2"></i>Trips</h6>
+    <button type="button" class="btn btn-primary btn-sm float-right" data-toggle="modal" data-target="#addTripModal"><i class="fas fa-plus"></i></button>
+  </div>
+  <div class="card-body">
+    <form autocomplete="off">
+      <div class="input-group">
+        <input type="search" class="form-control col-md-4" name="q" value="<?php if(isset($q)){echo stripslashes($q);} ?>" placeholder="Search Trips">
+        <div class="input-group-append">
+          <button class="btn btn-primary"><i class="fa fa-search"></i></button>
+        </div>
+      </div>
+    </form>
+    <hr>
+    <div class="table-responsive">
+      <table class="table table-striped table-borderless table-hover">
+        <thead class="text-dark <?php if($num_rows[0] == 0){ echo "d-none"; } ?>">
+          <tr>
+            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=trip_date&o=<?php echo $disp; ?>">Date</a></th>
+            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=trip_purpose&o=<?php echo $disp; ?>">Purpose</a></th>
+            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=trip_starting_location&o=<?php echo $disp; ?>">From</a></th>
+            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=trip_destination&o=<?php echo $disp; ?>">To</a></th>
+            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=trip_miles&o=<?php echo $disp; ?>">Miles</a></th>
+            <th class="text-center">Action</th>
+          </tr>
+        </thead>
+        <tbody>
+          <?php
+      
+          while($row = mysqli_fetch_array($sql)){
+            $trip_id = $row['trip_id'];
+            $trip_date = $row['trip_date'];
+            $trip_purpose = $row['trip_purpose'];
+            $trip_starting_location = $row['trip_starting_location'];
+            $trip_destination = $row['trip_destination'];
+            $trip_miles = $row['trip_miles'];
+            $round_trip = $row['round_trip'];
+            $client_id = $row['client_id'];
+            $invoice_id = $row['invoice_id'];
+            $location_id = $row['location_id'];
+            $vendor_id = $row['vendor_id'];
+
+            if($round_trip == 1){
+              $round_tip_display = "<i class='fa fa-fw fa-sync-alt text-secondary'></i>";
+            }
+
+          ?>
+          <tr>
+            <td><a class="text-dark" href="#" data-toggle="modal" data-target="#editTripModal<?php echo $trip_id; ?>"><?php echo $trip_date; ?></a></td>
+            <td><?php echo $trip_purpose; ?></td>
+            <td><?php echo $trip_starting_location; ?></td>
+            <td><?php echo $trip_destination; ?></td>
+            <td><?php echo "$trip_miles $round_tip_display"; ?></td>
+            <td>
+              <div class="dropdown dropleft text-center">
+                <button class="btn btn-secondary btn-sm" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                  <i class="fas fa-ellipsis-h"></i>
+                </button>
+                <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
+                  <a class="dropdown-item" href="//maps.google.com?q=<?php echo $trip_starting_location; ?> to <?php echo $trip_destination; ?>" target="_blank">Map it</a>
+                  <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editTripModal<?php echo $trip_id; ?>">Edit</a>
+                  <a class="dropdown-item" href="#" data-toggle="modal" data-target="#addTripCopyModal<?php echo $trip_id; ?>">Copy</a>
+                  <a class="dropdown-item" href="post.php?delete_trip=<?php echo $trip_id; ?>">Delete</a>
+                </div>
+              </div>
+  
+              <?php 
+              
+              include("client_add_trip_copy_modal.php");
+              include("client_edit_trip_modal.php");
+
+              ?>
+              
+            </td>
+          </tr>
+
+          <?php
+          
+          }
+          
+          ?>
+
+        </tbody>
+      </table>
+
+      <?php include("pagination.php"); ?>
+
+    </div>
+  </div>
+</div>
+
+<?php include("client_add_trip_modal.php"); ?>
\ No newline at end of file
diff --git a/invoices.php b/invoices.php
index 73cef365..5b9654b6 100644
--- a/invoices.php
+++ b/invoices.php
@@ -90,10 +90,20 @@
     $disp = "ASC";
   }
 
+  //Date From and Date To Filter
+  if(isset($_GET['dtf'])){
+    $dtf = $_GET['dtf'];
+    $dtt = $_GET['dtt'];
+  }else{
+    $dtf = "0000-00-00";
+    $dtt = "9999-00-00";
+  }
+
   $sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM invoices, clients, categories
     WHERE invoices.client_id = clients.client_id
     AND invoices.category_id = categories.category_id
     AND invoices.company_id = $session_company_id
+    AND DATE(invoice_date) BETWEEN '$dtf' AND '$dtt'
     AND (invoice_number LIKE '%$q%' OR client_name LIKE '%$q%' OR invoice_status LIKE '%$q%')
     ORDER BY $sb $o LIMIT $record_from, $record_to");
 
diff --git a/side_nav.php b/side_nav.php
index 68e2acaa..d7eab62d 100644
--- a/side_nav.php
+++ b/side_nav.php
@@ -2,7 +2,7 @@
 <aside class="main-sidebar sidebar-dark-primary elevation-4 d-print-none">
   
   <!-- Brand Logo -->
-  <a href="index3.html" class="brand-link">
+  <a href="index.php" class="brand-link">
     <img src="dist/img/AdminLTELogo.png" alt="AdminLTE Logo" class="brand-image img-circle elevation-3"
          style="opacity: .8">
     <span class="brand-text font-weight-light"><?php echo $config_app_name; ?></span>
diff --git a/top_nav.php b/top_nav.php
index d1d13030..b547f8c1 100644
--- a/top_nav.php
+++ b/top_nav.php
@@ -9,9 +9,9 @@
   </ul>
   
   <!-- SEARCH FORM -->
-  <form class="form-inline ml-auto mr-5" action="global_search.php">
+  <form class="form-inline ml-auto mr-5" action="clients.php">
     <div class="input-group input-group-sm">
-      <input class="form-control form-control-navbar" type="search" placeholder="Search" name="query" value="<?php if(isset($_GET['query'])){ echo $_GET['query']; } ?>">
+      <input class="form-control form-control-navbar" type="search" placeholder="Search" name="q">
       <div class="input-group-append">
         <button class="btn btn-navbar" type="submit">
           <i class="fas fa-search"></i>