diff --git a/campaign_details.php b/campaign.php
similarity index 100%
rename from campaign_details.php
rename to campaign.php
diff --git a/add_campaign_modal.php b/campaign_add_modal.php
similarity index 99%
rename from add_campaign_modal.php
rename to campaign_add_modal.php
index f0c5eb14..1c37eeee 100644
--- a/add_campaign_modal.php
+++ b/campaign_add_modal.php
@@ -1,4 +1,4 @@
-<div class="modal" id="addCampaignModal" tabindex="-1">
+<div class="modal" id="campaignAddModal" tabindex="-1">
   <div class="modal-dialog modal-lg">
     <div class="modal-content bg-dark">
       <div class="modal-header">
diff --git a/edit_campaign_modal.php b/campaign_edit_modal.php
similarity index 99%
rename from edit_campaign_modal.php
rename to campaign_edit_modal.php
index 1b00de4a..acfbe0ac 100644
--- a/edit_campaign_modal.php
+++ b/campaign_edit_modal.php
@@ -1,4 +1,4 @@
-<div class="modal" id="editCampaignModal<?php echo $campaign_id; ?>" tabindex="-1">
+<div class="modal" id="campaignEditModal<?php echo $campaign_id; ?>" tabindex="-1">
   <div class="modal-dialog modal-lg">
     <div class="modal-content bg-dark">
       <div class="modal-header">
diff --git a/campaigns.php b/campaigns.php
index b321a05d..d7d3d54c 100644
--- a/campaigns.php
+++ b/campaigns.php
@@ -95,7 +95,7 @@
   <div class="card-header py-2">
     <h3 class="card-title mt-2"><i class="fa fa-fw fa-envelope"></i> Mailing Campaigns</h3>
     <div class="card-tools">
-      <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addCampaignModal"><i class="fas fa-fw fa-plus"></i> New Campaign</button>
+      <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#campaignAddModal"><i class="fas fa-fw fa-plus"></i> New Campaign</button>
     </div>
   </div>
 
@@ -194,7 +194,7 @@
 
           ?>
           <tr>
-            <td><a href="campaign_details.php?campaign_id=<?php echo $campaign_id; ?>"><?php echo $campaign_name; ?></a></td>
+            <td><a href="campaign.php?campaign_id=<?php echo $campaign_id; ?>"><?php echo $campaign_name; ?></a></td>
             <td>-</td>
             <td>-</td>
             <td>-</td>
@@ -213,8 +213,8 @@
                 <div class="dropdown-menu">
                   <a class="dropdown-item" href="#" data-toggle="modal" data-target="#campaignTestModal<?php echo $campaign_id; ?>">Test</a>
                   <div class="dropdown-divider"></div>
-                  <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editCampaignModal<?php echo $campaign_id; ?>">Edit</a>
-                  <a class="dropdown-item" href="#" data-toggle="modal" data-target="#addCampaignCopyModal<?php echo $campaign_id; ?>">Copy</a>
+                  <a class="dropdown-item" href="#" data-toggle="modal" data-target="#campaignEditModal<?php echo $campaign_id; ?>">Edit</a>
+                  <a class="dropdown-item" href="#" data-toggle="modal" data-target="#campaignCopyModal<?php echo $campaign_id; ?>">Copy</a>
                   <div class="dropdown-divider"></div>
                   <a class="dropdown-item text-danger" href="post.php?delete_campaign=<?php echo $campaign_id; ?>">Delete</a>
                 </div>
@@ -224,8 +224,8 @@
 
           <?php
 
-          include("add_campaign_copy_modal.php");
-          include("edit_campaign_modal.php");
+          include("campaign_copy_modal.php");
+          include("campaign_edit_modal.php");
           include("campaign_test_modal.php");
           
           }
diff --git a/client.php b/client.php
index 6f3368e3..57094863 100644
--- a/client.php
+++ b/client.php
@@ -66,7 +66,7 @@ if(isset($_GET['client_id'])){
     }
   
     $client_tag_id_array[] = $client_tag_id;
-    $client_tag_name_display_array[] = "<span class='badge bg-$client_tag_color'><i class='fa fa-fw fa-$client_tag_icon'></i> $client_tag_name</span>";
+    $client_tag_name_display_array[] = "<div class='badge bg-$client_tag_color'><i class='fa fa-fw fa-$client_tag_icon'></i> $client_tag_name</div> ";
   }
   $client_tags_display = implode('', $client_tag_name_display_array);
 
diff --git a/clients.php b/clients.php
index e1543ca6..c26f37dd 100644
--- a/clients.php
+++ b/clients.php
@@ -217,7 +217,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
               }
             
               $client_tag_id_array[] = $client_tag_id;
-              $client_tag_name_display_array[] = "<span class='badge bg-$client_tag_color'><i class='fa fa-fw fa-$client_tag_icon'></i> $client_tag_name</span>";
+              $client_tag_name_display_array[] = "<span class='badge bg-$client_tag_color'><i class='fa fa-fw fa-$client_tag_icon'></i> $client_tag_name</span> ";
             }
             $client_tags_display = implode('', $client_tag_name_display_array);