diff --git a/client.php b/client.php
index cbbee250..173ae828 100644
--- a/client.php
+++ b/client.php
@@ -198,6 +198,7 @@ if(isset($_GET['client_id'])){
           </button>
           <div class="dropdown-menu">
             <a class="dropdown-item" href="client_print.php?client_id=<?php echo $client_id; ?>">Print</a>
+            <a class="dropdown-item" href="post.php?export_client_csv=<?php echo $client_id; ?>">Export</a>
             <div class="dropdown-divider"></div>
             <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editClientModal<?php echo $client_id; ?>">Edit</a>
             <div class="dropdown-divider"></div>
diff --git a/client_contacts.php b/client_contacts.php
index 437a24cd..db702afb 100644
--- a/client_contacts.php
+++ b/client_contacts.php
@@ -56,11 +56,24 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
     <form autocomplete="off">
       <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
       <input type="hidden" name="tab" value="<?php echo $_GET['tab']; ?>">
-      <div class="input-group mb-3">
-        <input type="search" class="form-control " name="q" value="<?php if(isset($q)){echo stripslashes($q);} ?>" placeholder="Search <?php echo ucwords($_GET['tab']); ?>">
-        <div class="input-group-append">
-          <button class="btn btn-secondary"><i class="fa fa-search"></i></button>
+      <div class="row">
+        
+        <div class="col-md-4">
+          <div class="input-group mb-3 mb-md-0">
+            <input type="search" class="form-control" name="q" value="<?php if(isset($q)){echo stripslashes($q);} ?>" placeholder="Search <?php echo ucwords($_GET['tab']); ?>">
+            <div class="input-group-append">
+              <button class="btn btn-dark"><i class="fa fa-search"></i></button>
+            </div>
+          </div>
         </div>
+
+        <div class="col-sm-8">
+          <div class="float-right">
+            <a href="post.php?export_client_contacts_csv=<?php echo $client_id; ?>" class="btn btn-default"><i class="fa fa-fw fa-download"></i> Export</a>
+            <a href="post.php?import_trips_csv" class="btn btn-default"><i class="fa fa-fw fa-upload"></i> Import</a>
+          </div>
+        </div>
+
       </div>
     </form>
     <hr>
diff --git a/post.php b/post.php
index 17ad06af..a831ecae 100644
--- a/post.php
+++ b/post.php
@@ -4002,4 +4002,88 @@ if(isset($_GET['export_trips_csv'])){
   
 }
 
+if(isset($_GET['export_client_contacts_csv'])){
+    $client_id = intval($_GET['export_client_contacts_csv']);
+
+    //get records from database
+    $sql = mysqli_query($mysqli,"SELECT * FROM clients WHERE client_id = $client_id AND company_id = $session_company_id");
+    $row = mysqli_fetch_array($sql);
+
+    $client_name = $row['client_name'];
+    
+    //Contacts
+    $sql = mysqli_query($mysqli,"SELECT * FROM contacts WHERE client_id = $client_id ORDER BY contact_name ASC");
+    if($sql->num_rows > 0){
+        $delimiter = ",";
+        $filename = $client_name . "-Contacts-" . date('Y-m-d') . ".csv";
+        
+        //create a file pointer
+        $f = fopen('php://memory', 'w');
+        
+        //set column headers
+        $fields = array('Name', 'Title', 'Email', 'Phone', 'Mobile');
+        fputcsv($f, $fields, $delimiter);
+        
+        //output each row of the data, format line as csv and write to file pointer
+        while($row = $sql->fetch_assoc()){
+            $lineData = array($row['contact_name'], $row['contact_title'], $row['contact_email'], $row['contact_phone'], $row['contact_mobile']);
+            fputcsv($f, $lineData, $delimiter);
+        }
+        
+        //move back to beginning of file
+        fseek($f, 0);
+        
+        //set headers to download file rather than displayed
+        header('Content-Type: text/csv');
+        header('Content-Disposition: attachment; filename="' . $filename . '";');
+        
+        //output all remaining data on a file pointer
+        fpassthru($f);
+    }
+    exit;
+  
+}
+
+if(isset($_GET['export_client_locations_csv'])){
+    $client_id = intval($_GET['export_client_locations_csv']);
+
+    //get records from database
+    $sql = mysqli_query($mysqli,"SELECT * FROM clients WHERE client_id = $client_id AND company_id = $session_company_id");
+    $row = mysqli_fetch_array($sql);
+
+    $client_name = $row['client_name'];
+    
+    //Locations
+    $sql = mysqli_query($mysqli,"SELECT * FROM locations WHERE client_id = $client_id ORDER BY location_name ASC");
+    if($sql->num_rows > 0){
+        $delimiter = ",";
+        $filename = $client_name . "-Locations-" . date('Y-m-d') . ".csv";
+        
+        //create a file pointer
+        $f = fopen('php://memory', 'w');
+        
+        //set column headers
+        $fields = array('Name', 'Address', 'City', 'State', 'Postal Code', 'Phone');
+        fputcsv($f, $fields, $delimiter);
+        
+        //output each row of the data, format line as csv and write to file pointer
+        while($row = $sql->fetch_assoc()){
+            $lineData = array($row['location_name'], $row['location_address'], $row['location_city'], $row['location_state'], $row['location_zip'], $row['location_phone']);
+            fputcsv($f, $lineData, $delimiter);
+        }
+        
+        //move back to beginning of file
+        fseek($f, 0);
+        
+        //set headers to download file rather than displayed
+        header('Content-Type: text/csv');
+        header('Content-Disposition: attachment; filename="' . $filename . '";');
+        
+        //output all remaining data on a file pointer
+        fpassthru($f);
+    }
+    exit;
+  
+}
+
 ?>