diff --git a/campaign.php b/campaign.php
index 8b23a127..29c96636 100644
--- a/campaign.php
+++ b/campaign.php
@@ -1,321 +1,167 @@
-<?php include("config.php"); ?>
-<?php include("header.php"); ?>
+<?php include("header.php");
 
-<?php 
+if(isset($_GET['campaign_id'])){
+  $campaign_id = intval($_GET['campaign_id']);
 
-if(isset($_GET['ticket_id'])){
-  $ticket_id = intval($_GET['ticket_id']);
-
-  $sql = mysqli_query($mysqli,"SELECT * FROM tickets LEFT JOIN clients ON ticket_client_id = client_id LEFT JOIN contacts ON ticket_contact_id = contact_id LEFT JOIN users ON ticket_assigned_to = user_id LEFT JOIN locations ON ticket_location_id = location_id WHERE ticket_id = $ticket_id AND tickets.company_id = $session_company_id");
-
-  if(mysqli_num_rows($sql) == 0){
-    echo "<center><h1 class='text-secondary mt-5'>Nothing to see here</h1><a class='btn btn-lg btn-secondary mt-3' href='tickets.php'><i class='fa fa-fw fa-arrow-left'></i> Go Back</a></center>";
-
-    include("footer.php");
-  
-  }else{
+  $sql = mysqli_query($mysqli,"SELECT * FROM campaigns WHERE campaign_id = $campaign_id AND company_id = $session_company_id");
 
   $row = mysqli_fetch_array($sql);
-  $client_id = $row['client_id'];
-  $client_name = $row['client_name'];
-  $client_type = $row['client_type'];
-  $client_website = $row['client_website'];
-  $client_net_terms = $row['client_net_terms'];
-  if($client_net_terms == 0){
-    $client_net_terms = $config_default_net_terms;
-  }
-  $ticket_prefix = $row['ticket_prefix'];
-  $ticket_number = $row['ticket_number'];
-  $ticket_category = $row['ticket_category'];
-  $ticket_subject = $row['ticket_subject'];
-  $ticket_details = $row['ticket_details'];
-  $ticket_priority = $row['ticket_priority'];
-  $ticket_status = $row['ticket_status'];
-  $ticket_created_at = $row['ticket_created_at'];
-  $ticket_updated_at = $row['ticket_updated_at'];
-  $ticket_closed_at = $row['ticket_closed_at'];
-  $ticket_created_by = $row['ticket_created_by'];
 
-  if($ticket_status == "Open"){
-    $ticket_status_display = "<span class='p-2 badge badge-primary'>$ticket_status</span>";
-  }elseif($ticket_status == "Working"){
-    $ticket_status_display = "<span class='p-2 badge badge-success'>$ticket_status</span>";
+  $campaign_name = $row['campaign_name'];
+  $campaign_subject = $row['campaign_subject'];
+  $campaign_content = $row['campaign_content'];
+  $campaign_status = $row['campaign_status'];
+  $campaign_scheduled_at = $row['campaign_scheduled_at'];
+  $campaign_created_at = $row['campaign_created_at'];
+
+  //Set Badge color based off of campaign status
+  if($campaign_status == "Sent"){
+    $campaign_badge_color = "warning text-white";
+  }elseif($campaign_status == "Queued"){
+    $campaign_badge_color = "info";
+  }elseif($campaign_status == "Sending"){
+    $campaign_badge_color = "primary";
+  }elseif($campaign_status == "Sent"){
+    $campaign_badge_color = "success";
   }else{
-    $ticket_status_display = "<span class='p-2 badge badge-secondary'>$ticket_status</span>";
+    $campaign_badge_color = "secondary";
   }
 
-  if($ticket_priority == "High"){
-    $ticket_priority_display = "<span class='p-2 badge badge-danger'>$ticket_priority</span>";
-  }elseif($ticket_priority == "Medium"){
-    $ticket_priority_display = "<span class='p-2 badge badge-warning'>$ticket_priority</span>";
-  }elseif($ticket_priority == "Low"){
-    $ticket_priority_display = "<span class='p-2 badge badge-info'>$ticket_priority</span>";
-  }else{
-    $ticket_priority_display = "-";
-  }
+  ?>
 
-  $contact_id = $row['contact_id'];
-  $contact_name = $row['contact_name'];
-  $contact_title = $row['contact_title'];
-  $contact_email = $row['contact_email'];
-  $contact_phone = formatPhoneNumber($row['contact_phone']);
-  $contact_extension = $row['contact_extension'];
-  $contact_mobile = formatPhoneNumber($row['contact_mobile']);
-  $location_name = $row['location_name'];
-  $location_address = $row['location_address'];
-  $location_city = $row['location_city'];
-  $location_state = $row['location_state'];
-  $location_zip = $row['location_zip'];
-  $location_phone = formatPhoneNumber($row['location_phone']);
+  <ol class="breadcrumb">
+    <li class="breadcrumb-item">
+      <a href="campaigns.php">Campaigns</a>
+    </li>
+    <li class="breadcrumb-item active"><?php echo $campaign_name; ?></li>
+  </ol>
 
-  $ticket_assigned_to = $row['ticket_assigned_to'];
-  if(empty($ticket_assigned_to)){
-    $ticket_assigned_to_display = "<span class='text-danger'>Not Assigned</span>";
-  }else{
-    $ticket_assigned_to_display = $row['user_name'];
-  }
-
-?>
-
-<!-- Breadcrumbs-->
-<ol class="breadcrumb">
-  <li class="breadcrumb-item">
-    <a href="tickets.php">Tickets</a>
-  </li>
-  <li class="breadcrumb-item">
-    <a href="client.php?client_id=<?php echo $client_id; ?>&tab=tickets"><?php echo $client_name; ?></a>
-  </li>
-  <li class="breadcrumb-item active">Ticket Details</li>
-</ol>
-
-<div class="row mb-3">
-  <div class="col-9">
-    <h3>Ticket <?php echo "$ticket_prefix$ticket_number"; ?> <?php echo $ticket_status_display; ?></h3>
-  </div>
-  <div class="col-3">
-
-    <div class="dropdown dropleft text-center">
-      <button class="btn btn-secondary btn-sm float-right" type="button" id="dropdownMenuButton" data-toggle="dropdown">
-        <i class="fas fa-fw fa-ellipsis-v"></i>
-      </button>
-      <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
-        <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editTicketModal<?php echo $ticket_id; ?>">Edit</a>
-        <div class="dropdown-divider"></div>
-        <a class="dropdown-item text-danger" href="post.php?delete_client=<?php echo $client_id; ?>">Delete</a>
-      </div>
+  <div class="card">
+    <div class="card-body">
+      <h1><?php echo $campaign_name; ?></h1>
     </div>
   </div>
-</div>
 
-<div class="row">
 
-  <div class="col-md-9">
-
-    <div class="card card-outline card-primary mb-3">
-      <div class="card-header">
-        <h3 class="card-title"><?php echo $ticket_subject; ?></h3>
-      </div>
-      <div class="card-body">
-        <?php echo $ticket_details; ?>
-      </div>
-    </div>
-
-    <form class="mb-3" action="post.php" method="post" autocomplete="off">
-      <input type="hidden" name="ticket_id" value="<?php echo $ticket_id; ?>">
-      <div class="form-group">
-        <textarea class="form-control summernote" name="ticket_reply"></textarea>
-      </div>
-      <div class="form-row">
-        <div class="col-md-3">
-          <div class="form-group">
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-thermometer-half"></i></span>
-              </div>
-              <select class="form-control select2" name="status" required>
-                <option <?php if($ticket_status == 'Open'){ echo "selected"; } ?> >Open</option>
-                <option <?php if($ticket_status == 'Working'){ echo "selected"; } ?> >Working</option>
-                <option <?php if($ticket_status == 'On Hold'){ echo "selected"; } ?> >On Hold</option>
-                <option <?php if($ticket_status == 'Closed'){ echo "selected"; } ?> >Closed</option>
-              </select>
-            </div>
-          </div>
-        </div>
-
-        <?php if(!empty($config_smtp_host) AND !empty($client_email)){ ?>
-
-        <div class="col-md-2">
-          <div class="form-group">
-            <div class="custom-control custom-checkbox">
-              <input type="checkbox" class="custom-control-input" id="customControlAutosizing" name="email_ticket_reply" value="1" checked>
-              <label class="custom-control-label" for="customControlAutosizing">Email update to client</label>
-            </div>
-          </div>
-        </div>
-
-        <?php } ?>
-        
-        <div class="col-md-1">
-          <button type="submit" name="add_ticket_reply" class="btn btn-primary"><i class="fa fa-fw fa-check"></i> Save</button>
-        </div>
-
-        <?php
-        if($ticket_status !== "Closed"){
-        ?>
-          <div class="col-md-2">
-            <a href="post.php?close_ticket=<?php echo $ticket_id; ?>" class="btn btn-outline-danger btn-block">Close Ticket</a>
-          </div>
-        <?php
-        }
-        ?>
-
-      </div>
+  <?php
+  //Paging
+  if(isset($_GET['p'])){
+    $p = intval($_GET['p']);
+    $record_from = (($p)-1)*$_SESSION['records_per_page'];
+    $record_to = $_SESSION['records_per_page'];
+  }else{
+    $record_from = 0;
+    $record_to = $_SESSION['records_per_page'];
+    $p = 1;
+  }
     
-    </form>
+  if(isset($_GET['q'])){
+    $q = mysqli_real_escape_string($mysqli,$_GET['q']);
+  }else{
+    $q = "";
+  }
 
-    <?php
-    $sql = mysqli_query($mysqli,"SELECT * FROM ticket_replies LEFT JOIN users ON ticket_reply_by = user_id WHERE ticket_reply_ticket_id = $ticket_id AND ticket_reply_archived_at IS NULL ORDER BY ticket_reply_id DESC");
+  if(!empty($_GET['sb'])){
+    $sb = mysqli_real_escape_string($mysqli,$_GET['sb']);
+  }else{
+    $sb = "message_id";
+  }
 
-      while($row = mysqli_fetch_array($sql)){;
-        $ticket_reply_id = $row['ticket_reply_id'];
-        $ticket_reply = $row['ticket_reply'];
-        $ticket_reply_created_at = $row['ticket_reply_created_at'];
-        $ticket_reply_by = $row['ticket_reply_by'];
-        $ticket_reply_by_display = $row['user_name'];
-        $user_id = $row['user_id'];
-        $user_avatar = $row['user_avatar'];
-        $user_initials = initials($user_name);
-    ?>
-
-    <div class="card mb-3">
-      
-      <div class="card-header">
-        <h3 class="card-title">
-          <div class="media">
-            <?php if(!empty($user_avatar)){ ?>
-            <img src="<?php echo "uploads/users/$user_id/$user_avatar"; ?>" alt="User Avatar" class="img-size-50 mr-3 img-circle">
-            <?php }else{ ?>
-            <span class="fa-stack fa-2x">
-              <i class="fa fa-circle fa-stack-2x text-secondary"></i>
-              <span class="fa fa-stack-1x text-white"><?php echo $user_initials; ?></span>
-            </span>
-            <?php 
-            }
-            ?>
-
-            <div class="media-body">
-              <?php echo $ticket_reply_by_display; ?>
-              <br>
-              <small class="text-muted"><?php echo $ticket_reply_created_at; ?></small>
-            </div>
-          </div>
-        </h3>
-      
-        <div class="card-tools">
-          <div class="dropdown dropleft">
-            <button class="btn btn-tool" type="button" id="dropdownMenuButton" data-toggle="dropdown">
-              <i class="fas fa-fw fa-ellipsis-v"></i>
-            </button>
-            <div class="dropdown-menu">
-              <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editTicketReplyModal<?php echo $ticket_reply_id; ?>"><i class="fas fa-fw fa-edit text-secondary"></i> Edit</a>
-              <div class="dropdown-divider"></div>
-              <a class="dropdown-item text-danger" href="post.php?archive_ticket_reply=<?php echo $ticket_reply_id; ?>"><i class="fas fa-fw fa-trash text-danger"></i> Delete</a>
-            </div>
-          </div>
-        </div>
-      </div>
-
-      <div class="card-body">
-        <?php echo $ticket_reply; ?>
-      </div>
-    </div>
-
-    <?php
-    
-    include("edit_ticket_reply_modal.php");
-    
+  if(isset($_GET['o'])){
+    if($_GET['o'] == 'ASC'){
+      $o = "ASC";
+      $disp = "DESC";
+    }else{
+      $o = "DESC";
+      $disp = "ASC";
     }
-    
-    ?>
-  
-  </div>
+  }else{
+    $o = "DESC";
+    $disp = "ASC";
+  }
 
-  <div class="col-md-3">
+  //Rebuild URL
+  $url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
 
-    <div class="card mb-3">
-      <div class="card-body">
-        <div>  
-          <h4 class="text-secondary">Client</h4>
-          <i class="fa fa-fw fa-user text-secondary ml-1 mr-2 mb-2"></i> <?php echo $client_name; ?>
-        </div>
-      </div>
-    </div>
+  $sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM campaign_messages
+    LEFT JOIN contacts ON contact_id = message_contact_id
+    LEFT JOIN clients ON primary_contact = contact_id
+    WHERE (contact_name LIKE '%$q%' OR contact_email LIKE '%$q%' OR client_name LIKE '%$q%')
+    AND message_campaign_id = $campaign_id
+    AND campaign_messages.company_id = $session_company_id
+    ORDER BY $sb $o LIMIT $record_from, $record_to"
+  );
 
-    <?php if(!empty($contact_id)){ ?>
-
-    <div class="card mb-3">
-      <div class="card-body">
-        <div>  
-          <h4 class="text-secondary">Contact</h4>
-          <i class="fa fa-fw fa-user text-secondary ml-1 mr-2 mb-2"></i> <?php echo $contact_name; ?>
-          <br>
-          <?php
-          if(!empty($location_name)){
-          ?>
-          <i class="fa fa-fw fa-map-marker-alt text-secondary ml-1 mr-2 mb-2"></i> <?php echo $location_name; ?>
-          <br>
-          <?php
-          }
-          ?>
-          <?php
-          if(!empty($contact_email)){
-          ?>
-          <i class="fa fa-fw fa-envelope text-secondary ml-1 mr-2 mb-2"></i> <a href="mailto:<?php echo $contact_email; ?>"><?php echo $contact_email; ?></a>
-          <br>
-          <?php
-          }
-          ?>
-          <?php
-          if(!empty($contact_phone)){
-          ?>
-          <i class="fa fa-fw fa-phone text-secondary ml-1 mr-2 mb-2"></i> <?php echo $contact_phone; ?>
-          <br>
-          <?php 
-          } 
-          ?>
-          <?php
-          if(!empty($contact_mobile)){
-          ?>
-          <i class="fa fa-fw fa-mobile text-secondary ml-1 mr-2 mb-2"></i> <?php echo $contact_mobile; ?>
-          <br>
-          <?php 
-          } 
-          ?>
-        </div>
-      </div>
-    </div>
-
-    <?php } ?>
-
-    <div class="card card-body mb-3"> 
-      <h4 class="text-secondary">Details</h4>
-      <div class="ml-1"><i class="fa fa-fw fa-thermometer-half text-secondary mr-2 mb-2"></i> <?php echo $ticket_priority_display; ?></div>
-      <div class="ml-1"><i class="fa fa-fw fa-user text-secondary mr-2 mb-2"></i> <?php echo $ticket_assigned_to_display; ?></div>
-      <div class="ml-1"><i class="fa fa-fw fa-clock text-secondary mr-2 mb-2"></i> <?php echo $ticket_created_at; ?></div>
-    </div>
-
-  </div>
-
-</div>
-
-<?php include("edit_ticket_modal.php"); ?>
-
-<?php 
-
-}
-
-}
+  $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
+  $total_found_rows = $num_rows[0];
+  $total_pages = ceil($total_found_rows / 10);
 
 ?>
 
-<?php include("footer.php");
+<div class="card card-dark">
+  <div class="card-header py-3">
+    <h3 class="card-title"><i class="fa fa-fw fa-envelope"></i> Messages</h3>
+  </div>
+  <div class="card-body">
+    <form class="mb-4" autocomplete="off">
+      <input type="hidden" name="campaign_id" value="<?php echo $campaign_id; ?>">
+      <div class="row">
+        <div class="col-sm-4">
+          <div class="input-group">
+            <input type="search" class="form-control" name="q" value="<?php if(isset($q)){echo stripslashes($q);} ?>" placeholder="Search Messages">
+            <div class="input-group-append">
+              <button class="btn btn-primary"><i class="fa fa-search"></i></button>
+            </div>
+          </div>
+        </div>
+        <div class="col-sm-8">
+        </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=client_name&o=<?php echo $disp; ?>">Client Name</a></th>
+            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=contact_name&o=<?php echo $disp; ?>">Contact Name</a></th>
+            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=contact_email&o=<?php echo $disp; ?>">Email</a></th>
+            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=message_sent_at&o=<?php echo $disp; ?>">Sent</a></th>
+          </tr>
+        </thead>
+        <tbody>
+          <?php
+      
+          while($row = mysqli_fetch_array($sql)){
+            $message_id = $row['message_id'];
+            $client_id = $row['client_id'];
+            $client_name = $row['client_name'];
+            $contact_id = $row['contact_id'];
+            $contact_name = $row['contact_name'];
+            $contact_email = $row['contact_email'];
+            $message_sent_at = $row['message_sent_at'];
+
+          ?>
+          <tr>
+            <td><?php echo $client_name; ?></td>
+            <td><?php echo $contact_name; ?></td>
+            <td><?php echo $contact_email; ?></td>
+            <td><?php echo $message_sent_at; ?></td>
+          </tr>
+
+          <?php
+          
+          }
+          
+          ?>
+
+        </tbody>
+      </table>
+    </div>
+    <?php include("pagination.php"); ?>
+  </div>
+</div>
+
+<?php } ?>
+
+<?php include("footer.php");
\ No newline at end of file
diff --git a/quote.php b/quote.php
index 5219922e..c1607331 100644
--- a/quote.php
+++ b/quote.php
@@ -99,7 +99,6 @@ if(isset($_GET['quote_id'])){
   <span class="ml-3 p-2 badge badge-<?php echo $quote_badge_color; ?>"><?php echo $quote_status; ?></span>
 </ol>
 
-
 <div class="card">
   <div class="card-header d-print-none">
 
diff --git a/side_nav.php b/side_nav.php
index fef2a5fc..20054c0b 100644
--- a/side_nav.php
+++ b/side_nav.php
@@ -66,7 +66,7 @@
 
         <li class="nav-header mt-3">SUPPORT</li>
         <li class="nav-item">
-          <a href="tickets.php" class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "tickets.php") { echo "active"; } ?>">
+          <a href="tickets.php" class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "tickets.php" OR basename($_SERVER["PHP_SELF"]) == "ticket.php") { echo "active"; } ?>">
             <i class="nav-icon fas fa-tags"></i>
             <p>Tickets</p>
           </a>
@@ -91,9 +91,9 @@
         </li>
 
         <li class="nav-item">
-          <a href="campaigns.php" class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "campaigns.php") { echo "active"; } ?>">
+          <a href="campaigns.php" class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "campaigns.php" OR basename($_SERVER["PHP_SELF"]) == "campaign.php") { echo "active"; } ?>">
             <i class="nav-icon fas fa-envelope"></i>
-            <p>Mail List</p>
+            <p>Campaigns</p>
           </a>
         </li>