diff --git a/client_service_add_modal.php b/client_service_add_modal.php
index d8148f52..5d818933 100644
--- a/client_service_add_modal.php
+++ b/client_service_add_modal.php
@@ -1,238 +1,246 @@
 <div class="modal" id="addServiceModal" tabindex="-1">
-    <div class="modal-dialog modal-md">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
-                <h5 class="modal-title text-white"><i class="fa fa-fw fa-stream mr-2"></i> New Service</h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span aria-hidden="true">&times;</span>
-                </button>
+  <div class="modal-dialog modal-md">
+    <div class="modal-content bg-dark">
+      <div class="modal-header">
+        <h5 class="modal-title text-white"><i class="fa fa-fw fa-stream mr-2"></i> New Service</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_id" value="<?php echo $client_id ?>">
+
+        <div class="modal-body bg-white">
+
+          <ul class="nav nav-pills nav-justified mb-3">
+            <li class="nav-item">
+              <a class="nav-link active" data-toggle="pill" href="#pills-overview">Overview</a>
+            </li>
+            <li class="nav-item">
+              <a class="nav-link" data-toggle="pill" href="#pills-general">General</a>
+            </li>
+            <li class="nav-item">
+              <a class="nav-link" data-toggle="pill" href="#pills-assets">Assets</a>
+            </li>
+          </ul>
+
+          <hr>
+
+          <div class="tab-content">
+
+            <!-- //TODO: The multiple selects won't play nicely with the icons or just general formatting. I've just added blank <p> tags to format it better for now -->
+
+            <div class="tab-pane fade show active" id="pills-overview">
+
+              <div class="form-group">
+                <label>Name <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-stream"></i></span>
+                  </div>
+                  <input type="text" class="form-control" name="name" placeholder="Name of Service" required autofocus>
+                </div>
+              </div>
+
+              <div class="form-group">
+                <label>Description <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-info-circle"></i></span>
+                  </div>
+                  <input type="text" class="form-control" name="description" placeholder="Description of Service" required autofocus>
+                </div>
+              </div>
+
+              <!--   //TODO: Integrate with company wide categories: /categories.php  -->
+              <div class="form-group">
+                <label>Category</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-info"></i></span>
+                  </div>
+                  <input type="text" class="form-control" name="category" placeholder="Category" autofocus>
+                </div>
+              </div>
+
+              <div class="form-group">
+                <label>Importance</label>
+                <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="importance" required>
+                    <option>Low</option>
+                    <option>Medium</option>
+                    <option>High</option>
+                  </select>
+                </div>
+              </div>
+
+              <div class="form-group">
+                <label>Backup</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-hdd"></i></span>
+                  </div>
+                  <input type="text" class="form-control" name="backup" placeholder="Backup strategy" autofocus>
+                </div>
+              </div>
+
+              <div class="form-group">
+                <label>Notes</label>
+                <textarea class="form-control" rows="3" placeholder="Enter some notes" name="note"></textarea>
+              </div>
             </div>
 
-            <form action="post.php" method="post" autocomplete="off">
-                <input type="hidden" name="client_id" value="<?php echo $client_id ?>">
+            <div class="tab-pane fade" id="pills-general">
+              <div class="form-group">
+                <label for="contacts">Contacts</label>
+                <p></p>
+                <select class="form-select" id="contacts" name="contacts[]" multiple="multiple">
+                  <option value="">- Contacts -</option>
+                  <?php
+                  $sql = mysqli_query($mysqli, "SELECT * FROM contacts WHERE contact_client_id = '$client_id'");
+                  while($row = mysqli_fetch_array($sql)){
+                    $contact_id = $row['contact_id'];
+                    $contact_name = $row['contact_name'];
+                    echo "<option value=\"$contact_id\">$contact_name</option>";
+                  }
+                  ?>
+                </select>
+              </div>
 
-                <div class="modal-body bg-white">
+              <div class="form-group">
+                <label for="vendors">Vendors</label>
+                <p></p>
+                <select class="form-select" id="vendors" name="vendors[]" multiple="multiple">
+                  <option value="">- Vendors -</option>
+                  <?php
+                  $sql = mysqli_query($mysqli, "SELECT * FROM vendors WHERE vendor_client_id = '$client_id'");
+                  while($row = mysqli_fetch_array($sql)){
+                    $vendor_id = $row['vendor_id'];
+                    $vendor_name = $row['vendor_name'];
+                    echo "<option value=\"$vendor_id\">$vendor_name</option>";
+                  }
+                  ?>
+                </select>
+              </div>
 
-                    <ul class="nav nav-pills nav-justified mb-3">
-                        <li class="nav-item">
-                            <a class="nav-link active" data-toggle="pill" href="#pills-overview">Overview</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link" data-toggle="pill" href="#pills-general">General</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link" data-toggle="pill" href="#pills-assets">Assets</a>
-                        </li>
-                    </ul>
+              <div class="form-group">
+                <label for="documents">Documents</label>
+                <p></p>
+                <select class="form-select" id="documents" name="documents[]" multiple="multiple">
+                  <option value="">- Documents -</option>
+                  <?php
+                  $sql = mysqli_query($mysqli, "SELECT * FROM documents WHERE document_client_id = '$client_id'");
+                  while($row = mysqli_fetch_array($sql)){
+                    $document_id = $row['document_id'];
+                    $document_name = $row['document_name'];
+                    echo "<option value=\"$document_id\">$document_name</option>";
+                  }
+                  ?>
+                </select>
+              </div>
 
-                    <hr>
+              <!-- TODO: Services related to other services -->
 
-                    <div class="tab-content">
-
-                        <!-- //TODO: The multiple selects won't play nicely with the icons or just general formatting. I've just added blank <p> tags to format it better for now -->
-
-                        <div class="tab-pane fade show active" id="pills-overview">
-
-                            <div class="form-group">
-                                <label>Name <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-stream"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="name" placeholder="Name of Service" required autofocus>
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>Description <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-info-circle"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="description" placeholder="Description of Service" required autofocus>
-                                </div>
-                            </div>
-
-                            <!--   //TODO: Integrate with company wide categories: /categories.php  -->
-                           <div class="form-group">
-                               <label>Category</label>
-                               <div class="input-group">
-                                   <div class="input-group-prepend">
-                                       <span class="input-group-text"><i class="fa fa-fw fa-info"></i></span>
-                                   </div>
-                                   <input type="text" class="form-control" name="category" placeholder="Category" autofocus>
-                               </div>
-                           </div>
-
-                            <div class="form-group">
-                                <label>Importance</label>
-                                <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="importance" required>
-                                        <option>Low</option>
-                                        <option>Medium</option>
-                                        <option>High</option>
-                                    </select>
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>Backup</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-hdd"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="backup" placeholder="Backup strategy" autofocus>
-                                </div>
-                            </div>
-
-                            <!-- TODO: We need a way of adding multiple (optional) URLs? Ideas? -->
-                            <!-- <div class="form-group">
-                                <label>URL</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-link"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="url" placeholder="URL" autofocus>
-                                </div>
-                            </div> -->
-
-                            <div class="form-group">
-                                <label>Notes</label>
-                                <textarea class="form-control" rows="3" placeholder="Enter some notes" name="note"></textarea>
-                            </div>
-                        </div>
-
-                        <div class="tab-pane fade" id="pills-general">
-                            <div class="form-group">
-                                <label for="contacts">Contacts</label>
-                                <p></p>
-                                <select class="form-select" id="contacts" name="contacts[]" multiple="multiple">
-                                    <option value="">- Contacts -</option>
-                                    <?php
-                                    $sql = mysqli_query($mysqli, "SELECT * FROM contacts WHERE contact_client_id = '$client_id'");
-                                    while($row = mysqli_fetch_array($sql)){
-                                        $contact_id = $row['contact_id'];
-                                        $contact_name = $row['contact_name'];
-                                        echo "<option value=\"$contact_id\">$contact_name</option>";
-                                    }
-                                    ?>
-                                </select>
-                            </div>
-
-                            <div class="form-group">
-                                <label for="vendors">Vendors</label>
-                                <p></p>
-                                <select class="form-select" id="vendors" name="vendors[]" multiple="multiple">
-                                    <option value="">- Vendors -</option>
-                                    <?php
-                                    $sql = mysqli_query($mysqli, "SELECT * FROM vendors WHERE vendor_client_id = '$client_id'");
-                                    while($row = mysqli_fetch_array($sql)){
-                                        $vendor_id = $row['vendor_id'];
-                                        $vendor_name = $row['vendor_name'];
-                                        echo "<option value=\"$vendor_id\">$vendor_name</option>";
-                                    }
-                                    ?>
-                                </select>
-                            </div>
-
-                            <div class="form-group">
-                                <label for="documents">Documents</label>
-                                <p></p>
-                                <select class="form-select" id="documents" name="documents[]" multiple="multiple">
-                                    <option value="">- Documents -</option>
-                                    <?php
-                                    $sql = mysqli_query($mysqli, "SELECT * FROM documents WHERE document_client_id = '$client_id'");
-                                    while($row = mysqli_fetch_array($sql)){
-                                        $document_id = $row['document_id'];
-                                        $document_name = $row['document_name'];
-                                        echo "<option value=\"$document_id\">$document_name</option>";
-                                    }
-                                    ?>
-                                </select>
-                            </div>
-
-                            <!-- TODO: Services related to other services -->
-
-                        </div>
+            </div>
 
 
-                        <div class="tab-pane fade" id="pills-assets">
-                            <div class="form-group">
-                                <label for="assets">Assets</label>
-                                <p></p>
-                                <select class="form-select" id="assets" name="assets[]" multiple="multiple">
-                                    <option value="">- Assets -</option>
-                                    <?php
-                                    $sql = mysqli_query($mysqli, "SELECT * FROM assets WHERE asset_client_id = '$client_id'");
-                                    while($row = mysqli_fetch_array($sql)){
-                                        $asset_id = $row['asset_id'];
-                                        $asset_name = $row['asset_name'];
-                                        echo "<option value=\"$asset_id\">$asset_name</option>";
-                                    }
-                                    ?>
-                                </select>
-                            </div>
+            <div class="tab-pane fade" id="pills-assets">
 
-                            <div class="form-group">
-                                <label for="logins">Logins</label>
-                                <p class="text-muted">Logins associated to related assets will show as related automatically</p>
-                                <select class="form-select" id="logins" name="logins[]" multiple="multiple">
-                                    <option value="">- Logins -</option>
-                                    <?php
-                                    $sql = mysqli_query($mysqli, "SELECT * FROM logins WHERE login_client_id = '$client_id'");
-                                    while($row = mysqli_fetch_array($sql)){
-                                        $login_id = $row['login_id'];
-                                        $login_name = $row['login_name'];
-                                        echo "<option value=\"$login_id\">$login_name</option>";
-                                    }
-                                    ?>
-                                </select>
-                            </div>
+              <div class="row">
 
-                            <div class="form-group">
-                                <label for="domains">Domains</label>
-                                <p></p>
-                                <select class="form-select" id="domains" name="domains[]" multiple="multiple">
-                                    <option value="">- Domains -</option>
-                                    <?php
-                                    $sql = mysqli_query($mysqli, "SELECT * FROM domains WHERE domain_client_id = '$client_id'");
-                                    while($row = mysqli_fetch_array($sql)){
-                                        $domain_id = $row['domain_id'];
-                                        $domain_name = $row['domain_name'];
-                                        echo "<option value=\"$domain_id\">$domain_name</option>";
-                                    }
-                                    ?>
-                                </select>
-                            </div>
-
-                            <div class="form-group">
-                                <label for="certificates">Certificates</label>
-                                <p></p>
-                                <select class="form-select" id="certificates" name="certificates[]" multiple="multiple">
-                                    <option value="">- Certificates -</option>
-                                    <?php
-                                    $sql = mysqli_query($mysqli, "SELECT * FROM certificates WHERE certificate_client_id = '$client_id'");
-                                    while($row = mysqli_fetch_array($sql)){
-                                        $cert_id = $row['certificate_id'];
-                                        $cert_name = $row['certificate_name'];
-                                        $cert_domain = $row['certificate_domain'];
-                                        echo "<option value=\"$cert_id\">$cert_name ($cert_domain)</option>";
-                                    }
-                                    ?>
-                                </select>
-                            </div>
-                        </div>
-
-                    </div>
+                <div class="col">
+                  <div class="form-group">
+                    <label for="assets">Assets</label>
+                    <p></p>
+                    <select class="form-select" id="assets" name="assets[]" multiple="multiple">
+                      <option value="">- Assets -</option>
+                      <?php
+                      $sql = mysqli_query($mysqli, "SELECT * FROM assets WHERE asset_client_id = '$client_id'");
+                      while($row = mysqli_fetch_array($sql)){
+                        $asset_id = $row['asset_id'];
+                        $asset_name = $row['asset_name'];
+                        echo "<option value=\"$asset_id\">$asset_name</option>";
+                      }
+                      ?>
+                    </select>
+                  </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_service" class="btn btn-primary">Save</button>
+
+                <div class="col">
+                  <div class="form-group">
+                    <label for="logins">Logins</label>
+                    <p></p>
+                    <select class="form-select" id="logins" name="logins[]" multiple="multiple">
+                      <option value="">- Logins -</option>
+                      <?php
+                      $sql = mysqli_query($mysqli, "SELECT * FROM logins WHERE login_client_id = '$client_id'");
+                      while($row = mysqli_fetch_array($sql)){
+                        $login_id = $row['login_id'];
+                        $login_name = $row['login_name'];
+                        echo "<option value=\"$login_id\">$login_name</option>";
+                      }
+                      ?>
+                    </select>
+                  </div>
                 </div>
-            </form>
+
+              </div>
+
+
+              <div class="row">
+
+                <div class="col">
+                  <div class="form-group">
+                    <label for="domains">Domains</label>
+                    <p></p>
+                    <select class="form-select" id="domains" name="domains[]" multiple="multiple">
+                      <option value="">- Domains -</option>
+                      <?php
+                      $sql = mysqli_query($mysqli, "SELECT * FROM domains WHERE domain_client_id = '$client_id'");
+                      while($row = mysqli_fetch_array($sql)){
+                        $domain_id = $row['domain_id'];
+                        $domain_name = $row['domain_name'];
+                        echo "<option value=\"$domain_id\">$domain_name</option>";
+                      }
+                      ?>
+                    </select>
+                  </div>
+                </div>
+
+                <div class="col">
+                  <div class="form-group">
+                    <label for="certificates">Certificates</label>
+                    <p></p>
+                    <select class="form-select" id="certificates" name="certificates[]" multiple="multiple">
+                      <option value="">- Certificates -</option>
+                      <?php
+                      $sql = mysqli_query($mysqli, "SELECT * FROM certificates WHERE certificate_client_id = '$client_id'");
+                      while($row = mysqli_fetch_array($sql)){
+                        $cert_id = $row['certificate_id'];
+                        $cert_name = $row['certificate_name'];
+                        $cert_domain = $row['certificate_domain'];
+                        echo "<option value=\"$cert_id\">$cert_name ($cert_domain)</option>";
+                      }
+                      ?>
+                    </select>
+                  </div>
+                </div>
+
+              </div>
+
+            </div>
+
+          </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_service" class="btn btn-primary">Save</button>
+        </div>
+      </form>
     </div>
+  </div>
 </div>
diff --git a/client_service_edit_modal.php b/client_service_edit_modal.php
index ba5d7c81..092d958b 100644
--- a/client_service_edit_modal.php
+++ b/client_service_edit_modal.php
@@ -1,290 +1,307 @@
 <div class="modal" id="editServiceModal<?php echo $service_id ?>" tabindex="-1">
-    <div class="modal-dialog modal-md">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
-                <h5 class="modal-title text-white"><i class="fa fa-fw fa-stream mr-2"></i><?php echo "Edit $service_name"; ?> </h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span aria-hidden="true">&times;</span>
-                </button>
+  <div class="modal-dialog modal-md">
+    <div class="modal-content bg-dark">
+      <div class="modal-header">
+        <h5 class="modal-title text-white"><i class="fa fa-fw fa-stream mr-2"></i><?php echo "Edit $service_name"; ?> </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_id" value="<?php echo $client_id ?>">
+        <input type="hidden" name="service_id" value="<?php echo $service_id ?>">
+
+        <div class="modal-body bg-white">
+
+          <ul class="nav nav-pills nav-justified mb-3">
+            <li class="nav-item">
+              <a class="nav-link active" data-toggle="pill" href="#pills-overview<?php echo $service_id ?>">Overview</a>
+            </li>
+            <li class="nav-item">
+              <a class="nav-link" data-toggle="pill" href="#pills-general<?php echo $service_id ?>">General</a>
+            </li>
+            <li class="nav-item">
+              <a class="nav-link" data-toggle="pill" href="#pills-assets<?php echo $service_id ?>">Assets</a>
+            </li>
+          </ul>
+
+          <hr>
+
+          <div class="tab-content">
+
+            <!-- //TODO: The multiple selects won't play nicely with the icons or just general formatting. I've just added blank <p> tags to format it better for now -->
+
+            <div class="tab-pane fade show active" id="pills-overview<?php echo $service_id ?>">
+
+              <div class="form-group">
+                <label>Name <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-stream"></i></span>
+                  </div>
+                  <input type="text" class="form-control" name="name" placeholder="Name of Service" value="<?php echo $service_name ?>" required autofocus>
+                </div>
+              </div>
+
+              <div class="form-group">
+                <label>Description <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-info-circle"></i></span>
+                  </div>
+                  <input type="text" class="form-control" name="description" placeholder="Description of Service" value="<?php echo $service_description ?>" required autofocus>
+                </div>
+              </div>
+
+              <!--   //TODO: Integrate with company wide categories: /categories.php  -->
+              <div class="form-group">
+                <label>Category</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-info"></i></span>
+                  </div>
+                  <input type="text" class="form-control" name="category" placeholder="Category" value="<?php echo $service_category ?>" autofocus>
+                </div>
+              </div>
+
+              <div class="form-group">
+                <label>Importance</label>
+                <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="importance" required>
+                    <option <?php if($service_importance == 'Low'){ echo "selected"; } ?> >Low</option>
+                    <option <?php if($service_importance == 'Medium'){ echo "selected"; } ?> >Medium</option>
+                    <option <?php if($service_importance == 'High'){ echo "selected"; } ?> >High</option>
+                  </select>
+                </div>
+              </div>
+
+              <div class="form-group">
+                <label>Backup</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-hdd"></i></span>
+                  </div>
+                  <input type="text" class="form-control" name="backup" placeholder="Backup strategy" value="<?php echo $service_backup ?>" autofocus>
+                </div>
+              </div>
+
+              <div class="form-group">
+                <label>Notes</label>
+                <textarea class="form-control" rows="3" placeholder="Enter some notes" name="note"><?php echo $service_notes ?></textarea>
+              </div>
             </div>
 
-            <form action="post.php" method="post" autocomplete="off">
-                <input type="hidden" name="client_id" value="<?php echo $client_id ?>">
-                <input type="hidden" name="service_id" value="<?php echo $service_id ?>">
+            <div class="tab-pane fade" id="pills-general<?php echo $service_id ?>">
+              <div class="form-group">
+                <label for="contacts">Contacts</label>
+                <p></p>
+                <select class="form-select" id="contacts" name="contacts[]" multiple="multiple">
+                  <option value="">- Contacts -</option>
+                  <?php
+                  // Get just the currently selected contact IDs
+                  $selected_ids = array_column(mysqli_fetch_all($sql_contacts,MYSQLI_ASSOC), "contact_id");
 
-                <div class="modal-body bg-white">
+                  // Get all contacts
+                  // NOTE: These are called $sql_all and $row_all for a reason - anything overwriting $sql or $row will break the current while loop we are in from client_services.php
+                  $sql_all = mysqli_query($mysqli, "SELECT * FROM contacts WHERE contact_client_id = '$client_id'");
 
-                    <ul class="nav nav-pills nav-justified mb-3">
-                        <li class="nav-item">
-                            <a class="nav-link active" data-toggle="pill" href="#pills-overview<?php echo $service_id ?>">Overview</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link" data-toggle="pill" href="#pills-general<?php echo $service_id ?>">General</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link" data-toggle="pill" href="#pills-assets<?php echo $service_id ?>">Assets</a>
-                        </li>
-                    </ul>
+                  while($row_all = mysqli_fetch_array($sql_all)){
+                    $contact_id = $row_all['contact_id'];
+                    $contact_name = $row_all['contact_name'];
 
-                    <hr>
+                    if(in_array($contact_id, $selected_ids)){
+                      echo "<option value=\"$contact_id\" selected>$contact_name</option>";
+                    }
+                    else{
+                      echo "<option value=\"$contact_id\">$contact_name</option>";
+                    }
+                  }
+                  ?>
+                </select>
+              </div>
 
-                    <div class="tab-content">
+              <div class="form-group">
+                <label for="vendors">Vendors</label>
+                <p></p>
+                <select class="form-select" id="vendors" name="vendors[]" multiple="multiple">
+                  <option value="">- Vendors -</option>
+                  <?php
+                  $selected_ids = array_column(mysqli_fetch_all($sql_vendors,MYSQLI_ASSOC), "vendor_id");
 
-                        <!-- //TODO: The multiple selects won't play nicely with the icons or just general formatting. I've just added blank <p> tags to format it better for now -->
+                  $sql_all = mysqli_query($mysqli, "SELECT * FROM vendors WHERE vendor_client_id = '$client_id'");
+                  while($row_all = mysqli_fetch_array($sql_all)){
+                    $vendor_id = $row_all['vendor_id'];
+                    $vendor_name = $row_all['vendor_name'];
 
-                        <div class="tab-pane fade show active" id="pills-overview<?php echo $service_id ?>">
+                    if(in_array($vendor_id, $selected_ids)){
+                      echo "<option value=\"$vendor_id\" selected>$vendor_name</option>";
+                    }
+                    else{
+                      echo "<option value=\"$vendor_id\">$vendor_name</option>";
+                    }
+                  }
+                  ?>
+                </select>
+              </div>
 
-                            <div class="form-group">
-                                <label>Name <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-stream"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="name" placeholder="Name of Service" value="<?php echo $service_name ?>" required autofocus>
-                                </div>
-                            </div>
+              <div class="form-group">
+                <label for="documents">Documents</label>
+                <p></p>
+                <select class="form-select" id="documents" name="documents[]" multiple="multiple">
+                  <option value="">- Documents -</option>
+                  <?php
+                  $selected_ids = array_column(mysqli_fetch_all($sql_docs,MYSQLI_ASSOC), "document_id");
 
-                            <div class="form-group">
-                                <label>Description <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-info-circle"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="description" placeholder="Description of Service" value="<?php echo $service_description ?>" required autofocus>
-                                </div>
-                            </div>
+                  $sql_all = mysqli_query($mysqli, "SELECT * FROM documents WHERE document_client_id = '$client_id'");
+                  while($row_all = mysqli_fetch_array($sql_all)){
+                    $document_id = $row_all['document_id'];
+                    $document_name = $row_all['document_name'];
 
-                            <!--   //TODO: Integrate with company wide categories: /categories.php  -->
-                            <div class="form-group">
-                                <label>Category</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-info"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="category" placeholder="Category" value="<?php echo $service_category ?>" autofocus>
-                                </div>
-                            </div>
+                    if(in_array($document_id, $selected_ids)){
+                      echo "<option value=\"$document_id\" selected>$document_name</option>";
+                    }
+                    else{
+                      echo "<option value=\"$document_id\">$document_name</option>";
+                    }
 
-                            <div class="form-group">
-                                <label>Importance</label>
-                                <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="importance" required>
-                                        <option <?php if($service_importance == 'Low'){ echo "selected"; } ?> >Low</option>
-                                        <option <?php if($service_importance == 'Medium'){ echo "selected"; } ?> >Medium</option>
-                                        <option <?php if($service_importance == 'High'){ echo "selected"; } ?> >High</option>
-                                    </select>
-                                </div>
-                            </div>
+                  }
+                  ?>
+                </select>
+              </div>
 
-                            <div class="form-group">
-                                <label>Backup</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-hdd"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="backup" placeholder="Backup strategy" value="<?php echo $service_backup ?>" autofocus>
-                                </div>
-                            </div>
+              <!-- TODO: Services related to other services -->
 
-                            <div class="form-group">
-                                <label>Notes</label>
-                                <textarea class="form-control" rows="3" placeholder="Enter some notes" name="note"><?php echo $service_notes ?></textarea>
-                            </div>
-                        </div>
-
-                        <div class="tab-pane fade" id="pills-general<?php echo $service_id ?>">
-                            <div class="form-group">
-                                <label for="contacts">Contacts</label>
-                                <p></p>
-                                <select class="form-select" id="contacts" name="contacts[]" multiple="multiple">
-                                    <option value="">- Contacts -</option>
-                                    <?php
-                                    // Get just the currently selected contact IDs
-                                    $selected_ids = array_column(mysqli_fetch_all($sql_contacts,MYSQLI_ASSOC), "contact_id");
-
-                                    // Get all contacts
-                                    // NOTE: These are called $sql_all and $row_all for a reason - anything overwriting $sql or $row will break the current while loop we are in from client_services.php
-                                    $sql_all = mysqli_query($mysqli, "SELECT * FROM contacts WHERE contact_client_id = '$client_id'");
-
-                                    while($row_all = mysqli_fetch_array($sql_all)){
-                                        $contact_id = $row_all['contact_id'];
-                                        $contact_name = $row_all['contact_name'];
-
-                                        if(in_array($contact_id, $selected_ids)){
-                                            echo "<option value=\"$contact_id\" selected>$contact_name</option>";
-                                        }
-                                        else{
-                                            echo "<option value=\"$contact_id\">$contact_name</option>";
-                                        }
-                                    }
-                                    ?>
-                                </select>
-                            </div>
-
-                            <div class="form-group">
-                                <label for="vendors">Vendors</label>
-                                <p></p>
-                                <select class="form-select" id="vendors" name="vendors[]" multiple="multiple">
-                                    <option value="">- Vendors -</option>
-                                    <?php
-                                    $selected_ids = array_column(mysqli_fetch_all($sql_vendors,MYSQLI_ASSOC), "vendor_id");
-
-                                    $sql_all = mysqli_query($mysqli, "SELECT * FROM vendors WHERE vendor_client_id = '$client_id'");
-                                    while($row_all = mysqli_fetch_array($sql_all)){
-                                        $vendor_id = $row_all['vendor_id'];
-                                        $vendor_name = $row_all['vendor_name'];
-
-                                        if(in_array($vendor_id, $selected_ids)){
-                                            echo "<option value=\"$vendor_id\" selected>$vendor_name</option>";
-                                        }
-                                        else{
-                                            echo "<option value=\"$vendor_id\">$vendor_name</option>";
-                                        }
-                                    }
-                                    ?>
-                                </select>
-                            </div>
-
-                            <div class="form-group">
-                                <label for="documents">Documents</label>
-                                <p></p>
-                                <select class="form-select" id="documents" name="documents[]" multiple="multiple">
-                                    <option value="">- Documents -</option>
-                                    <?php
-                                    $selected_ids = array_column(mysqli_fetch_all($sql_docs,MYSQLI_ASSOC), "document_id");
-
-                                    $sql_all = mysqli_query($mysqli, "SELECT * FROM documents WHERE document_client_id = '$client_id'");
-                                    while($row_all = mysqli_fetch_array($sql_all)){
-                                        $document_id = $row_all['document_id'];
-                                        $document_name = $row_all['document_name'];
-
-                                        if(in_array($document_id, $selected_ids)){
-                                            echo "<option value=\"$document_id\" selected>$document_name</option>";
-                                        }
-                                        else{
-                                            echo "<option value=\"$document_id\">$document_name</option>";
-                                        }
-
-                                    }
-                                    ?>
-                                </select>
-                            </div>
-
-                            <!-- TODO: Services related to other services -->
-
-                        </div>
+            </div>
 
 
-                        <div class="tab-pane fade" id="pills-assets<?php echo $service_id ?>">
-                            <div class="form-group">
-                                <label for="assets">Assets</label>
-                                <p></p>
-                                <select class="form-select" id="assets" name="assets[]" multiple="multiple">
-                                    <option value="">- Assets -</option>
-                                    <?php
-                                    $selected_ids = array_column(mysqli_fetch_all($sql_assets,MYSQLI_ASSOC), "asset_id");
+            <div class="tab-pane fade" id="pills-assets<?php echo $service_id ?>">
 
-                                    $sql_all = mysqli_query($mysqli, "SELECT * FROM assets WHERE asset_client_id = '$client_id'");
-                                    while($row_all = mysqli_fetch_array($sql_all)){
-                                        $asset_id = $row_all['asset_id'];
-                                        $asset_name = $row_all['asset_name'];
+              <div class="row">
 
-                                        if(in_array($asset_id, $selected_ids)){
-                                            echo "<option value=\"$asset_id\" selected>$asset_name</option>";
-                                        }
-                                        else{
-                                            echo "<option value=\"$asset_id\">$asset_name</option>";
-                                        }
-                                    }
-                                    ?>
-                                </select>
-                            </div>
+                <div class="col">
+                  <div class="form-group">
+                    <label for="assets">Assets</label>
+                    <p></p>
+                    <select class="form-select" id="assets" name="assets[]" multiple="multiple">
+                      <option value="">- Assets -</option>
+                      <?php
+                      $selected_ids = array_column(mysqli_fetch_all($sql_assets,MYSQLI_ASSOC), "asset_id");
 
-                            <div class="form-group">
-                                <label for="logins">Logins</label>
-                                <p class="text-muted">Logins associated to related assets will show as related automatically</p>
-                                <select class="form-select" id="logins" name="logins[]" multiple="multiple">
-                                    <option value="">- Logins -</option>
-                                    <?php
-                                    $selected_ids = array_column(mysqli_fetch_all($sql_logins,MYSQLI_ASSOC), "login_id");
+                      $sql_all = mysqli_query($mysqli, "SELECT * FROM assets WHERE asset_client_id = '$client_id'");
+                      while($row_all = mysqli_fetch_array($sql_all)){
+                        $asset_id = $row_all['asset_id'];
+                        $asset_name = $row_all['asset_name'];
 
-                                    $sql_all = mysqli_query($mysqli, "SELECT * FROM logins WHERE login_client_id = '$client_id'");
-                                    while($row_all = mysqli_fetch_array($sql_all)){
-                                        $login_id = $row_all['login_id'];
-                                        $login_name = $row_all['login_name'];
-
-                                        if(in_array($login_id, $selected_ids)){
-                                            echo "<option value=\"$login_id\" selected>$login_name</option>";
-                                        }
-                                        else{
-                                            echo "<option value=\"$login_id\">$login_name</option>";
-                                        }
-                                    }
-                                    ?>
-                                </select>
-
-                            </div>
-
-                            <div class="form-group">
-                                <label for="domains">Domains</label>
-                                <p></p>
-                                <select class="form-select" id="domains" name="domains[]" multiple="multiple">
-                                    <option value="">- Domains -</option>
-                                    <?php
-                                    $selected_ids = array_column(mysqli_fetch_all($sql_domains,MYSQLI_ASSOC), "domain_id");
-
-                                    $sql_all = mysqli_query($mysqli, "SELECT * FROM domains WHERE domain_client_id = '$client_id'");
-                                    while($row_all = mysqli_fetch_array($sql_all)){
-                                        $domain_id = $row_all['domain_id'];
-                                        $domain_name = $row_all['domain_name'];
-
-                                        if(in_array($domain_id, $selected_ids)){
-                                            echo "<option value=\"$domain_id\" selected>$domain_name</option>";
-                                        }
-                                        else{
-                                            echo "<option value=\"$domain_id\">$domain_name</option>";
-                                        }
-                                    }
-                                    ?>
-                                </select>
-                            </div>
-
-                            <div class="form-group">
-                                <label for="certificates">Certificates</label>
-                                <p></p>
-                                <select class="form-select" id="certificates" name="certificates[]" multiple="multiple">
-                                    <option value="">- Certificates -</option>
-                                    <?php
-                                    $selected_ids = array_column(mysqli_fetch_all($sql_certificates,MYSQLI_ASSOC), "certificate_id");
-
-                                    $sql_all = mysqli_query($mysqli, "SELECT * FROM certificates WHERE certificate_client_id = '$client_id'");
-                                    while($row_all = mysqli_fetch_array($sql_all)){
-                                        $cert_id = $row_all['certificate_id'];
-                                        $cert_name = $row_all['certificate_name'];
-
-                                        if(in_array($cert_id, $selected_ids)){
-                                            echo "<option value=\"$cert_id\" selected>$cert_name</option>";
-                                        }
-                                        else{
-                                            echo "<option value=\"$cert_id\">$cert_name</option>";
-                                        }
-                                    }
-                                    ?>
-                                </select>
-                            </div>
-
-                        </div>
-
-                    </div>
+                        if(in_array($asset_id, $selected_ids)){
+                          echo "<option value=\"$asset_id\" selected>$asset_name</option>";
+                        }
+                        else{
+                          echo "<option value=\"$asset_id\">$asset_name</option>";
+                        }
+                      }
+                      ?>
+                    </select>
+                  </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_service" class="btn btn-primary">Save</button>
+
+                <div class="col">
+                  <div class="form-group">
+                    <label for="logins">Logins</label>
+                    <p></p>
+                    <select class="form-select" id="logins" name="logins[]" multiple="multiple">
+                      <option value="">- Logins -</option>
+                      <?php
+                      $selected_ids = array_column(mysqli_fetch_all($sql_logins,MYSQLI_ASSOC), "login_id");
+
+                      $sql_all = mysqli_query($mysqli, "SELECT * FROM logins WHERE login_client_id = '$client_id'");
+                      while($row_all = mysqli_fetch_array($sql_all)){
+                        $login_id = $row_all['login_id'];
+                        $login_name = $row_all['login_name'];
+
+                        if(in_array($login_id, $selected_ids)){
+                          echo "<option value=\"$login_id\" selected>$login_name</option>";
+                        }
+                        else{
+                          echo "<option value=\"$login_id\">$login_name</option>";
+                        }
+                      }
+                      ?>
+                    </select>
+                  </div>
                 </div>
-            </form>
+
+              </div>
+
+
+              <div class="row">
+
+                <div class="col">
+                  <div class="form-group">
+                    <label for="domains">Domains</label>
+                    <p></p>
+                    <select class="form-select" id="domains" name="domains[]" multiple="multiple">
+                      <option value="">- Domains -</option>
+                      <?php
+                      $selected_ids = array_column(mysqli_fetch_all($sql_domains,MYSQLI_ASSOC), "domain_id");
+
+                      $sql_all = mysqli_query($mysqli, "SELECT * FROM domains WHERE domain_client_id = '$client_id'");
+                      while($row_all = mysqli_fetch_array($sql_all)){
+                        $domain_id = $row_all['domain_id'];
+                        $domain_name = $row_all['domain_name'];
+
+                        if(in_array($domain_id, $selected_ids)){
+                          echo "<option value=\"$domain_id\" selected>$domain_name</option>";
+                        }
+                        else{
+                          echo "<option value=\"$domain_id\">$domain_name</option>";
+                        }
+                      }
+                      ?>
+                    </select>
+                  </div>
+                </div>
+
+                <div class="col">
+                  <div class="form-group">
+                    <label for="certificates">Certificates</label>
+                    <p></p>
+                    <select class="form-select" id="certificates" name="certificates[]" multiple="multiple">
+                      <option value="">- Certificates -</option>
+                      <?php
+                      $selected_ids = array_column(mysqli_fetch_all($sql_certificates,MYSQLI_ASSOC), "certificate_id");
+
+                      $sql_all = mysqli_query($mysqli, "SELECT * FROM certificates WHERE certificate_client_id = '$client_id'");
+                      while($row_all = mysqli_fetch_array($sql_all)){
+                        $cert_id = $row_all['certificate_id'];
+                        $cert_name = $row_all['certificate_name'];
+
+                        if(in_array($cert_id, $selected_ids)){
+                          echo "<option value=\"$cert_id\" selected>$cert_name</option>";
+                        }
+                        else{
+                          echo "<option value=\"$cert_id\">$cert_name</option>";
+                        }
+                      }
+                      ?>
+                    </select>
+                  </div>
+                </div>
+
+              </div>
+
+            </div>
+
+          </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_service" class="btn btn-primary">Save</button>
+        </div>
+      </form>
     </div>
+  </div>
 </div>