diff --git a/account_add_modal.php b/account_add_modal.php
index 7ea25cf4..c79e3b57 100644
--- a/account_add_modal.php
+++ b/account_add_modal.php
@@ -53,7 +53,7 @@
         </div>
         <div class="modal-footer bg-white">
           <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="add_account" class="btn btn-primary"><i class="fa fa-fw fa-check"></i> Create</button>
+          <button type="submit" name="add_account" class="btn btn-primary text-bold"><i class="fa fa-fw fa-check"></i> Create</button>
         </div>
       </form>
     </div>
diff --git a/account_edit_modal.php b/account_edit_modal.php
index db4d102d..729e8dcf 100644
--- a/account_edit_modal.php
+++ b/account_edit_modal.php
@@ -2,7 +2,7 @@
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-fw fa-piggy-bank"></i> <?php echo $account_name; ?></h5>
+        <h5 class="modal-title"><i class="fa fa-fw fa-piggy-bank"></i> Editing account: <strong><?php echo $account_name; ?></strong></h5>
         <button type="button" class="close text-white" data-dismiss="modal">
           <span>&times;</span>
         </button>
@@ -28,8 +28,8 @@
 
         </div>
         <div class="modal-footer bg-white">
-          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="edit_account" class="btn btn-primary">Save</button>
+          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+          <button type="submit" name="edit_account" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Save</button>
         </div>
       </form>
     </div>
diff --git a/api_key_add_modal.php b/api_key_add_modal.php
index 4f6aa795..a48976fa 100644
--- a/api_key_add_modal.php
+++ b/api_key_add_modal.php
@@ -78,8 +78,8 @@ $key = bin2hex(random_bytes(78));
 
         </div>
         <div class="modal-footer bg-white">
-          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="add_api_key" class="btn btn-primary">Add</button>
+          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+          <button type="submit" name="add_api_key" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Create</button>
         </div>
       </form>
     </div>
diff --git a/category_add_modal.php b/category_add_modal.php
index e4a8db87..3c11aa54 100644
--- a/category_add_modal.php
+++ b/category_add_modal.php
@@ -40,8 +40,8 @@
         
         </div>
         <div class="modal-footer bg-white">
-          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="add_category" class="btn btn-primary">Save</button>
+          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+          <button type="submit" name="add_category" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Create</button>
         </div>
       </form>
     </div>
diff --git a/category_edit_modal.php b/category_edit_modal.php
index 8ecf7b15..520a3ef5 100644
--- a/category_edit_modal.php
+++ b/category_edit_modal.php
@@ -2,7 +2,7 @@
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-fw fa-list"></i> <?php echo $category_name; ?></h5>
+        <h5 class="modal-title"><i class="fa fa-fw fa-list"></i> Editing category: <strong><?php echo $category_name; ?></strong></h5>
         <button type="button" class="close text-white" data-dismiss="modal">
           <span>&times;</span>
         </button>
@@ -46,8 +46,8 @@
         
         </div>
         <div class="modal-footer bg-white">
-          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="edit_category" class="btn btn-primary">Save</button>
+          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+          <button type="submit" name="edit_category" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Save</button>
         </div>
       </form>
     </div>
diff --git a/company_add_modal.php b/company_add_modal.php
index 210c1359..5b0989d3 100644
--- a/company_add_modal.php
+++ b/company_add_modal.php
@@ -10,140 +10,177 @@
       <form action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
         <div class="modal-body bg-white">
 
-          <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-building"></i></span>
-              </div>
-              <input type="text" class="form-control" name="name" placeholder="Company Name" required autofocus>
-            </div>
-          </div>
+          <ul class="nav nav-pills nav-justified mb-3">
+            <li class="nav-item">
+              <a class="nav-link active" data-toggle="pill" href="#pills-details">Details</a>
+            </li>
+            <li class="nav-item">
+              <a class="nav-link" data-toggle="pill" href="#pills-address">Address</a>
+            </li>
+            <li class="nav-item">
+              <a class="nav-link" data-toggle="pill" href="#pills-contact" id="contactNavPill">Contact</a>
+            </li>
+            <li class="nav-item">
+              <a class="nav-link" data-toggle="pill" href="#pills-locale">Locale</a>
+            </li>
+          </ul>
 
-          <div class="form-group">
-            <label>Address</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="address" placeholder="Street Address">
-            </div>
-          </div>
+          <hr>
+          
+          <div class="tab-content">
 
-          <div class="form-group">
-            <label>City</label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-city"></i></span>
-              </div>
-              <input type="text" class="form-control" name="city" placeholder="City">
-            </div>
-          </div>
+            <div class="tab-pane fade show active" id="pills-details">
 
-          <div class="form-group">
-            <label>State / Province</label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-flag"></i></span>
+              <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-building"></i></span>
+                  </div>
+                  <input type="text" class="form-control" name="name" placeholder="Company Name" required autofocus>
+                </div>
               </div>
-              <input type="text" class="form-control" name="state" placeholder="State or Province">
-            </div>
-          </div>
 
-          <div class="form-group">
-            <label>Zip / Postal Code</label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fab fa-fw fa-usps"></i></span>
+              <div class="form-group mb-4">
+                <label>Logo</label>
+                <input type="file" class="form-control-file" name="file">
               </div>
-              <input type="text" class="form-control" name="zip" placeholder="Zip or Postal Code">
-            </div>
-          </div>
 
-          <div class="form-group">
-            <label>Country <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-flag"></i></span>
+            </div>
+
+            <div class="tab-pane fade" id="pills-address">
+
+              <div class="form-group">
+                <label>Address</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="address" placeholder="Street Address">
+                </div>
               </div>
-              <select class="form-control select2" name="country" required>
-                <option value="">- Country -</option>
-                <?php foreach($countries_array as $country_name) { ?>
-                <option><?php echo $country_name; ?></option>
-                <?php } ?>
-              </select>
-            </div>
-          </div>
 
-          <div class="form-group">
-            <label>Phone</label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-phone"></i></span>
+              <div class="form-group">
+                <label>City</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-city"></i></span>
+                  </div>
+                  <input type="text" class="form-control" name="city" placeholder="City">
+                </div>
               </div>
-              <input type="text" class="form-control" name="phone" placeholder="Phone Number"> 
-            </div>
-          </div>
 
-          <div class="form-group">
-            <label>Email</label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-envelope"></i></span>
+              <div class="form-group">
+                <label>State / Province</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-flag"></i></span>
+                  </div>
+                  <input type="text" class="form-control" name="state" placeholder="State or Province">
+                </div>
               </div>
-              <input type="email" class="form-control" name="email" placeholder="Email address"> 
-            </div>
-          </div>
 
-          <div class="form-group">
-            <label>Website</label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-globe"></i></span>
+              <div class="form-group">
+                <label>Zip / Postal Code</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fab fa-fw fa-usps"></i></span>
+                  </div>
+                  <input type="text" class="form-control" name="zip" placeholder="Zip or Postal Code">
+                </div>
               </div>
-              <input type="text" class="form-control" name="website" placeholder="Website address">
-            </div>
-          </div>
 
-          <div class="form-group">
-            <label>Locale <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-flag"></i></span>
+              <div class="form-group">
+                <label>Country <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-flag"></i></span>
+                  </div>
+                  <select class="form-control select2" name="country" required>
+                    <option value="">- Country -</option>
+                    <?php foreach($countries_array as $country_name) { ?>
+                    <option><?php echo $country_name; ?></option>
+                    <?php } ?>
+                  </select>
+                </div>
               </div>
-              <select class="form-control select2" name="locale" required>
-                <option value="">- Select a Locale -</option>
-                <?php foreach($locales_array as $locale_code => $locale_name) { ?>
-                <option value="<?php echo $locale_code; ?>"><?php echo "$locale_code - $locale_name"; ?></option>
-                <?php } ?>
-              </select>
-            </div>
-          </div>
 
-          <div class="form-group">
-            <label>Currency <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-money-bill"></i></span>
+            </div>
+
+            <div class="tab-pane fade" id="pills-contact">
+
+              <div class="form-group">
+                <label>Phone</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-phone"></i></span>
+                  </div>
+                  <input type="text" class="form-control" name="phone" placeholder="Phone Number"> 
+                </div>
               </div>
-              <select class="form-control select2" name="currency_code" required>
-                <option value="">- Currency -</option>
-                <?php foreach($currencies_array as $currency_code => $currency_name) { ?>
-                <option value="<?php echo $currency_code; ?>"><?php echo "$currency_code - $currency_name"; ?></option>
-                <?php } ?>
-              </select>
-            </div>
-          </div>
 
-          <div class="form-group mb-4">
-            <label>Logo</label>
-            <input type="file" class="form-control-file" name="file">
+              <div class="form-group">
+                <label>Email</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-envelope"></i></span>
+                  </div>
+                  <input type="email" class="form-control" name="email" placeholder="Email address"> 
+                </div>
+              </div>
+
+              <div class="form-group">
+                <label>Website</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-globe"></i></span>
+                  </div>
+                  <input type="text" class="form-control" name="website" placeholder="Website address">
+                </div>
+              </div>
+
+            </div>
+
+            <div class="tab-pane fade" id="pills-locale">
+
+              <div class="form-group">
+                <label>Locale <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-flag"></i></span>
+                  </div>
+                  <select class="form-control select2" name="locale" required>
+                    <option value="">- Select a Locale -</option>
+                    <?php foreach($locales_array as $locale_code => $locale_name) { ?>
+                    <option value="<?php echo $locale_code; ?>"><?php echo "$locale_code - $locale_name"; ?></option>
+                    <?php } ?>
+                  </select>
+                </div>
+              </div>
+
+              <div class="form-group">
+                <label>Currency <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-money-bill"></i></span>
+                  </div>
+                  <select class="form-control select2" name="currency_code" required>
+                    <option value="">- Currency -</option>
+                    <?php foreach($currencies_array as $currency_code => $currency_name) { ?>
+                    <option value="<?php echo $currency_code; ?>"><?php echo "$currency_code - $currency_name"; ?></option>
+                    <?php } ?>
+                  </select>
+                </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_company" class="btn btn-primary">Save</button>
+          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+          <button type="submit" name="add_company" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Create</button>
         </div>
       </form>
     </div>
diff --git a/company_edit_modal.php b/company_edit_modal.php
index 45900326..4bc0e4ad 100644
--- a/company_edit_modal.php
+++ b/company_edit_modal.php
@@ -2,7 +2,7 @@
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-fw fa-building"></i> <?php echo $company_name; ?></h5>
+        <h5 class="modal-title"><i class="fa fa-fw fa-building"></i> Editing company: <strong><?php echo $company_name; ?></strong></h5>
         <button type="button" class="close text-white" data-dismiss="modal">
           <span>&times;</span>
         </button>
@@ -12,146 +12,178 @@
         <input type="hidden" name="existing_file_name" value="<?php echo $company_logo; ?>">
         <div class="modal-body bg-white">
 
-          <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-building"></i></span>
+          <ul class="nav nav-pills nav-justified mb-3">
+            <li class="nav-item">
+              <a class="nav-link active" data-toggle="pill" href="#pills-details<?php echo $company_id; ?>">Details</a>
+            </li>
+            <li class="nav-item">
+              <a class="nav-link" data-toggle="pill" href="#pills-address<?php echo $company_id; ?>">Address</a>
+            </li>
+            <li class="nav-item">
+              <a class="nav-link" data-toggle="pill" href="#pills-contact<?php echo $company_id; ?>">Contact</a>
+            </li>
+            <li class="nav-item">
+              <a class="nav-link" data-toggle="pill" href="#pills-locale<?php echo $company_id; ?>">Locale</a>
+            </li>
+          </ul>
+
+          <hr>
+          
+          <div class="tab-content">
+
+            <div class="tab-pane fade show active" id="pills-details<?php echo $company_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-building"></i></span>
+                  </div>
+                  <input type="text" class="form-control" name="name" placeholder="Company Name" value="<?php echo $company_name; ?>" required>
+                </div>
               </div>
-              <input type="text" class="form-control" name="name" placeholder="Company Name" value="<?php echo $company_name; ?>" required>
-            </div>
-          </div>
 
-          <div class="form-group">
-            <label>Address</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 class="card col-md-2">
+                <div class="card-body">
+                  <img class="img-fluid" src="<?php echo "uploads/settings/$company_id/$company_logo"; ?>">
+                </div>
               </div>
-              <input type="text" class="form-control" name="address" placeholder="Street Address" value="<?php echo $company_address; ?>">
-            </div>
-          </div>
 
-          <div class="form-group">
-            <label>City</label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-city"></i></span>
+            </div>
+
+            <div class="tab-pane fade" id="pills-address<?php echo $company_id; ?>">
+
+              <div class="form-group">
+                <label>Address</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="address" placeholder="Street Address" value="<?php echo $company_address; ?>">
+                </div>
               </div>
-              <input type="text" class="form-control" name="city" placeholder="City" value="<?php echo $company_city; ?>">
-            </div>
-          </div>
 
-          <div class="form-group">
-            <label>State / Province</label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-flag"></i></span>
+              <div class="form-group">
+                <label>City</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-city"></i></span>
+                  </div>
+                  <input type="text" class="form-control" name="city" placeholder="City" value="<?php echo $company_city; ?>">
+                </div>
               </div>
-              <input type="text" class="form-control" name="state" placeholder="State or Province" value="<?php echo $company_state; ?>">
-            </div>
-          </div>
 
-          <div class="form-group">
-            <label>Zip / Postal Code</label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fab fa-fw fa-usps"></i></span>
+              <div class="form-group">
+                <label>State / Province</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-flag"></i></span>
+                  </div>
+                  <input type="text" class="form-control" name="state" placeholder="State or Province" value="<?php echo $company_state; ?>">
+                </div>
               </div>
-              <input type="text" class="form-control" name="zip" placeholder="Zip or Postal Code" value="<?php echo $company_zip; ?>">
-            </div>
-          </div>
 
-          <div class="form-group">
-            <label>Country</label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-flag"></i></span>
+              <div class="form-group">
+                <label>Zip / Postal Code</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fab fa-fw fa-usps"></i></span>
+                  </div>
+                  <input type="text" class="form-control" name="zip" placeholder="Zip or Postal Code" value="<?php echo $company_zip; ?>">
+                </div>
               </div>
-              <select class="form-control select2" name="country">
-                <option value="">- Country -</option>
-                <?php foreach($countries_array as $country_name) { ?>
-                <option <?php if($company_country == $country_name) { echo "selected"; } ?>><?php echo $country_name; ?></option>
-                <?php } ?>
-              </select>
-            </div>
-          </div>
 
-          <div class="form-group">
-            <label>Phone</label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-phone"></i></span>
+              <div class="form-group">
+                <label>Country</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-flag"></i></span>
+                  </div>
+                  <select class="form-control select2" name="country">
+                    <option value="">- Country -</option>
+                    <?php foreach($countries_array as $country_name) { ?>
+                    <option <?php if($company_country == $country_name) { echo "selected"; } ?>><?php echo $country_name; ?></option>
+                    <?php } ?>
+                  </select>
+                </div>
               </div>
-              <input type="text" class="form-control" name="phone" placeholder="Phone Number" value="<?php echo $company_phone; ?>"> 
-            </div>
-          </div>
 
-          <div class="form-group">
-            <label>Email</label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-envelope"></i></span>
+            </div>
+
+            <div class="tab-pane fade" id="pills-contact<?php echo $company_id; ?>">
+
+              <div class="form-group">
+                <label>Phone</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-phone"></i></span>
+                  </div>
+                  <input type="text" class="form-control" name="phone" placeholder="Phone Number" value="<?php echo $company_phone; ?>"> 
+                </div>
               </div>
-              <input type="email" class="form-control" name="email" placeholder="Email address" value="<?php echo $company_email; ?>">
-            </div>
-          </div>
 
-          <div class="form-group">
-            <label>Website</label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-globe"></i></span>
+              <div class="form-group">
+                <label>Email</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-envelope"></i></span>
+                  </div>
+                  <input type="email" class="form-control" name="email" placeholder="Email address" value="<?php echo $company_email; ?>">
+                </div>
               </div>
-              <input type="text" class="form-control" name="website" placeholder="Website address" value="<?php echo $company_website; ?>">
-            </div>
-          </div>
 
-          <div class="form-group">
-            <label>Locale <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-flag"></i></span>
+              <div class="form-group">
+                <label>Website</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-globe"></i></span>
+                  </div>
+                  <input type="text" class="form-control" name="website" placeholder="Website address" value="<?php echo $company_website; ?>">
+                </div>
               </div>
-              <select class="form-control select2" name="locale" required>
-                <option value="">- Select a Locale -</option>
-                <?php foreach($locales_array as $locale_code => $locale_name) { ?>
-                <option <?php if($company_locale == $locale_code){ echo "selected"; } ?> value="<?php echo $locale_code; ?>"><?php echo "$locale_code - $locale_name"; ?></option>
-                <?php } ?>
-              </select>
-            </div>
-          </div>
 
-          <div class="form-group">
-            <label>Currency <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-money-bill"></i></span>
+            </div>
+
+            <div class="tab-pane fade" id="pills-locale<?php echo $company_id; ?>">
+
+              <div class="form-group">
+                <label>Locale <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-flag"></i></span>
+                  </div>
+                  <select class="form-control select2" name="locale" required>
+                    <option value="">- Select a Locale -</option>
+                    <?php foreach($locales_array as $locale_code => $locale_name) { ?>
+                    <option <?php if($company_locale == $locale_code){ echo "selected"; } ?> value="<?php echo $locale_code; ?>"><?php echo "$locale_code - $locale_name"; ?></option>
+                    <?php } ?>
+                  </select>
+                </div>
               </div>
-              <select class="form-control select2" name="currency_code" required>
-                <option value="">- Currency -</option>
-                <?php foreach($currencies_array as $currency_code => $currency_name) { ?>
-                <option <?php if($company_currency == $currency_code){ echo "selected"; } ?> value="<?php echo $currency_code; ?>"><?php echo "$currency_code - $currency_name"; ?></option>
-                <?php } ?>
-              </select>
-            </div>
-          </div>
 
-          <div class="form-group mb-4">
-            <label>Logo</label>
-            <input type="file" class="form-control-file" name="file">
-          </div>
+              <div class="form-group">
+                <label>Currency <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-money-bill"></i></span>
+                  </div>
+                  <select class="form-control select2" name="currency_code" required>
+                    <option value="">- Currency -</option>
+                    <?php foreach($currencies_array as $currency_code => $currency_name) { ?>
+                    <option <?php if($company_currency == $currency_code){ echo "selected"; } ?> value="<?php echo $currency_code; ?>"><?php echo "$currency_code - $currency_name"; ?></option>
+                    <?php } ?>
+                  </select>
+                </div>
+              </div>
 
-          <div class="card col-md-2">
-            <div class="card-body">
-              <img class="img-fluid" src="<?php echo "uploads/settings/$company_id/$company_logo"; ?>">
             </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_company" class="btn btn-primary">Save</button>
+          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+          <button type="submit" name="edit_company" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Save</button>
         </div>
       </form>
     </div>
diff --git a/plugins/PHPMailer/VERSION b/plugins/PHPMailer/VERSION.md
similarity index 100%
rename from plugins/PHPMailer/VERSION
rename to plugins/PHPMailer/VERSION.md
diff --git a/settings_alerts.php b/settings_alerts.php
index 9e13c9df..3f9e7506 100644
--- a/settings_alerts.php
+++ b/settings_alerts.php
@@ -38,7 +38,7 @@
 
       <hr>
 
-      <button type="submit" name="edit_alert_settings" class="btn btn-primary">Save</button>
+      <button type="submit" name="edit_alert_settings" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Save</button>
         
     </form>
   </div>
diff --git a/settings_defaults.php b/settings_defaults.php
index d7299eb4..259e8115 100644
--- a/settings_defaults.php
+++ b/settings_defaults.php
@@ -196,7 +196,7 @@
 
       <hr>
       
-      <button type="submit" name="edit_default_settings" class="btn btn-primary">Save</button>
+      <button type="submit" name="edit_default_settings" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Save</button>
         
     </form>
   </div>
diff --git a/settings_integrations.php b/settings_integrations.php
index bb6d7858..9576ec22 100644
--- a/settings_integrations.php
+++ b/settings_integrations.php
@@ -30,7 +30,7 @@
 
       <hr>
       
-      <button type="submit" name="edit_integrations_settings" class="btn btn-primary">Save</button>
+      <button type="submit" name="edit_integrations_settings" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Save</button>
         
     </form>
   </div>
diff --git a/settings_invoice.php b/settings_invoice.php
index 16f8af31..e3298f8b 100644
--- a/settings_invoice.php
+++ b/settings_invoice.php
@@ -54,6 +54,8 @@
         </div>
       </div>
 
+      <hr>
+
       <legend>Recurring Invoice</legend>
 
       <div class="form-group">
@@ -80,7 +82,7 @@
     
       <hr>
 
-      <button type="submit" name="edit_invoice_settings" class="btn btn-primary">Save</button>        
+      <button type="submit" name="edit_invoice_settings" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Save</button>        
     
     </form>
   </div>
diff --git a/settings_mail.php b/settings_mail.php
index 51d16087..4b25de82 100644
--- a/settings_mail.php
+++ b/settings_mail.php
@@ -119,8 +119,10 @@
           </select>
         </div>
       </div>
+
+      <hr>
       
-      <button type="submit" name="edit_mail_settings" class="btn btn-primary">Save</button>
+      <button type="submit" name="edit_mail_settings" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Save</button>
         
     </form>
   </div>
diff --git a/settings_modules.php b/settings_modules.php
index 2e335e39..09c0a7ac 100644
--- a/settings_modules.php
+++ b/settings_modules.php
@@ -24,7 +24,7 @@
 
       <hr>
 
-      <button type="submit" name="edit_module_settings" class="btn btn-primary">Save</button>
+      <button type="submit" name="edit_module_settings" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Save</button>
         
     </form>
   </div>
diff --git a/settings_online_payment.php b/settings_online_payment.php
index 523fc397..db7a8d54 100644
--- a/settings_online_payment.php
+++ b/settings_online_payment.php
@@ -42,7 +42,7 @@
       
       <hr>
       
-      <button type="submit" name="edit_online_payment_settings" class="btn btn-primary">Save</button>
+      <button type="submit" name="edit_online_payment_settings" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Save</button>
         
     </form>
   </div>
diff --git a/settings_quote.php b/settings_quote.php
index 9fca55c7..f0bc54b6 100644
--- a/settings_quote.php
+++ b/settings_quote.php
@@ -6,8 +6,6 @@
   </div>
   <div class="card-body">
     <form action="post.php" method="post" autocomplete="off">
-      
-      <legend>Quote</legend>
 
       <div class="form-group">
         <label>Quote Prefix</label>
@@ -56,7 +54,7 @@
     
       <hr>
 
-      <button type="submit" name="edit_quote_settings" class="btn btn-primary">Save</button>        
+      <button type="submit" name="edit_quote_settings" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Save</button>        
     
     </form>
   </div>
diff --git a/settings_tag_add_modal.php b/settings_tag_add_modal.php
index f89bf6d4..14422720 100644
--- a/settings_tag_add_modal.php
+++ b/settings_tag_add_modal.php
@@ -57,8 +57,8 @@
         
         </div>
         <div class="modal-footer bg-white">
-          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="add_tag" class="btn btn-primary">Save</button>
+          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+          <button type="submit" name="add_tag" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Create</button>
         </div>
       </form>
     </div>
diff --git a/settings_tag_edit_modal.php b/settings_tag_edit_modal.php
index 299ecfc5..74167732 100644
--- a/settings_tag_edit_modal.php
+++ b/settings_tag_edit_modal.php
@@ -2,7 +2,7 @@
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-fw fa-tag"></i> <?php echo $tag_name; ?></h5>
+        <h5 class="modal-title"><i class="fa fa-fw fa-tag"></i> Editing tag: <strong><?php echo $tag_name; ?></strong></h5>
         <button type="button" class="close text-white" data-dismiss="modal">
           <span>&times;</span>
         </button>
@@ -63,8 +63,8 @@
         
         </div>
         <div class="modal-footer bg-white">
-          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="edit_tag" class="btn btn-primary">Save</button>
+          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+          <button type="submit" name="edit_tag" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Save</button>
         </div>
       </form>
     </div>
diff --git a/settings_tax_add_modal.php b/settings_tax_add_modal.php
index 5aac27d5..616ce00e 100644
--- a/settings_tax_add_modal.php
+++ b/settings_tax_add_modal.php
@@ -2,7 +2,7 @@
   <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-balance-scale mr-2"></i>New Tax</h5>
+        <h5 class="modal-title"><i class="fa fa-fw fa-balance-scale"></i> New Tax</h5>
         <button type="button" class="close text-white" data-dismiss="modal">
           <span aria-hidden="true">&times;</span>
         </button>
@@ -19,8 +19,8 @@
           </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_tax" class="btn btn-primary">Save</button>
+          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+          <button type="submit" name="add_tax" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Create</button>
         </div>
       </form>
     </div>
diff --git a/settings_tax_edit_modal.php b/settings_tax_edit_modal.php
index 458d3208..af0ccde2 100644
--- a/settings_tax_edit_modal.php
+++ b/settings_tax_edit_modal.php
@@ -2,7 +2,7 @@
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-fw fa-balance-scale"></i> <?php echo $tax_name; ?></h5>
+        <h5 class="modal-title"><i class="fa fa-fw fa-balance-scale"></i> Editing tax: <strong><?php echo $tax_name; ?></strong></h5>
         <button type="button" class="close text-white" data-dismiss="modal">
           <span>&times;</span>
         </button>
@@ -24,8 +24,8 @@
         
         </div>
         <div class="modal-footer bg-white">
-          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="edit_tax" class="btn btn-primary">Save</button>
+          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+          <button type="submit" name="edit_tax" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Save</button>
         </div>
       </form>
     </div>
diff --git a/settings_ticket.php b/settings_ticket.php
index 9479b773..e41dbb6f 100644
--- a/settings_ticket.php
+++ b/settings_ticket.php
@@ -55,7 +55,7 @@
     
       <hr>
       
-      <button type="submit" name="edit_ticket_settings" class="btn btn-primary">Save</button>        
+      <button type="submit" name="edit_ticket_settings" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Save</button>        
     
     </form>
   </div>