diff --git a/client_nav.php b/client_nav.php
index 514487b7..b7fbe624 100644
--- a/client_nav.php
+++ b/client_nav.php
@@ -2,7 +2,7 @@
   <?php if($num_contacts > 0){ ?>
   <li class="nav-item">
     <a class="nav-link active" href="?client_id=<?php echo $client_id; ?>&tab=contacts">
-      <i class="fa fa-users"></i><br>
+      <i class="fa fa-2x fa-users"></i><br>
       Contacts<br>
       <span class="badge badge-pill badge-light"><?php echo $num_contacts; ?></span>
     </a> 
@@ -11,7 +11,7 @@
   <?php if($num_locations > 0){ ?>
   <li class="nav-item">
     <a class="nav-link" href="?client_id=<?php echo $client_id; ?>&tab=locations">
-      <i class="fa fa-map-marker"></i><br>
+      <i class="fa fa-2x fa-map-marker"></i><br>
       Locations<br>
       <span class="badge badge-pill badge-fark"><?php echo $num_locations; ?></span>
       
@@ -21,7 +21,7 @@
   <?php if($num_assets > 0){ ?>
   <li class="nav-item">
     <a class="nav-link" href="?client_id=<?php echo $client_id; ?>&tab=assets">
-      <i class="fa fa-tag"></i><br>
+      <i class="fa fa-2x fa-tag"></i><br>
       Assets<br>
       <span class="badge badge-pill badge-dark"><?php echo $num_assets; ?></span>
     </a>
@@ -30,7 +30,7 @@
   <?php if($num_vendors > 0){ ?>
   <li class="nav-item">
     <a class="nav-link" href="?client_id=<?php echo $client_id; ?>&tab=vendors">
-      <i class="fa fa-building"></i><br>
+      <i class="fa fa-2x fa-building"></i><br>
       Vendors<br>
       <span class="badge badge-pill badge-secondary"><?php echo $num_vendors; ?></span>
     </a>
@@ -39,7 +39,7 @@
   <?php if($num_logins > 0){ ?>
   <li class="nav-item">
     <a class="nav-link" href="?client_id=<?php echo $client_id; ?>&tab=logins">
-      <i class="fa fa-key"></i><br>
+      <i class="fa fa-2x fa-key"></i><br>
       Logins<br>
       <span class="badge badge-pill badge-dark"><?php echo $num_logins; ?></span>
     </a>
@@ -48,7 +48,7 @@
   <?php if($num_networks > 0){ ?>
   <li class="nav-item">
     <a class="nav-link" href="?client_id=<?php echo $client_id; ?>&tab=networks">
-      <i class="fa fa-network-wired"></i><br>
+      <i class="fa fa-2x fa-network-wired"></i><br>
       Networks<br>
       <span class="badge badge-pill badge-dark"><?php echo $num_networks; ?></span>
     </a>
@@ -57,7 +57,7 @@
   <?php if($num_domains > 0){ ?>
   <li class="nav-item">
     <a class="nav-link" href="?client_id=<?php echo $client_id; ?>&tab=domains">
-      <i class="fa fa-globe"></i><br>
+      <i class="fa fa-2x fa-globe"></i><br>
       Domains<br>
       <span class="badge badge-pill badge-dark"><?php echo $num_domains; ?></span>
     </a>
@@ -66,7 +66,7 @@
   <?php if($num_applications > 0){ ?>
   <li class="nav-item">
     <a class="nav-link" href="?client_id=<?php echo $client_id; ?>&tab=applications">
-      <i class="fa fa-box"></i><br>
+      <i class="fa fa-2x fa-box"></i><br>
       Applications<br>
       <span class="badge badge-pill badge-dark"><?php echo $num_applications; ?></span>
     </a>
@@ -75,7 +75,7 @@
   <?php if($num_invoices > 0){ ?>
   <li class="nav-item">
     <a class="nav-link" href="?client_id=<?php echo $client_id; ?>&tab=invoices">
-      <i class="fa fa-file"></i><br>
+      <i class="fa fa-2x fa-file"></i><br>
       Invoices<br>
       <span class="badge badge-pill badge-dark"><?php echo $num_invoices; ?></span>
     </a>
@@ -84,7 +84,7 @@
   <?php if($num_recurring > 0){ ?>
   <li class="nav-item">
     <a class="nav-link" href="?client_id=<?php echo $client_id; ?>&tab=recurring">
-      <i class="fa fa-copy"></i><br>
+      <i class="fa fa-2x fa-copy"></i><br>
       Recurring<br>
       <span class="badge badge-pill badge-dark"><?php echo $num_recurring; ?></span>
     </a>
@@ -93,7 +93,7 @@
   <?php if($num_quotes > 0){ ?>
   <li class="nav-item">
     <a class="nav-link" href="?client_id=<?php echo $client_id; ?>&tab=quotes">
-      <i class="fa fa-file-o"></i><br>
+      <i class="fa fa-2x fa-file-o"></i><br>
       Quotes<br>
       <span class="badge badge-pill badge-dark"><?php echo $num_quotes; ?></span>
     </a>
@@ -102,7 +102,7 @@
   <?php if($num_files > 0){ ?>
   <li class="nav-item">
     <a class="nav-link" href="?client_id=<?php echo $client_id; ?>&tab=files">
-      <i class="fa fa-paperclip"></i><br>
+      <i class="fa fa-2x fa-paperclip"></i><br>
       Files<br>
       <span class="badge badge-pill badge-dark"><?php echo $num_files; ?></span>
     </a>
@@ -111,7 +111,7 @@
   <?php if($num_notes > 0){ ?>
   <li class="nav-item">
     <a class="nav-link" href="?client_id=<?php echo $client_id; ?>&tab=notes">
-      <i class="fa fa-edit"></i><br>
+      <i class="fa fa-2x fa-edit"></i><br>
       Notes<br>
       <span class="badge badge-pill badge-dark"><?php echo $num_notes; ?></span>
     </a>
diff --git a/config.php b/config.php
index 7bde514a..4052b8f1 100644
--- a/config.php
+++ b/config.php
@@ -16,9 +16,6 @@
 	$config_default_expenes_account = "";
 	$config_default_invoice_account = "";
 	$config_default_net_terms = "";
-	$config_default_starting_location = "";
-
-
 
 	$config_start_page = "clients.php";
 
diff --git a/settings-backup.php b/settings-backup.php
new file mode 100644
index 00000000..2224d841
--- /dev/null
+++ b/settings-backup.php
@@ -0,0 +1,18 @@
+<?php include("header.php"); ?>
+
+<?php $sql = mysqli_query($mysqli,"SELECT * FROM accounts ORDER BY account_id DESC"); ?>
+
+<?php include("settings-nav.php"); ?>
+
+<div class="card mb-3">
+  <div class="card-header">
+    <h6 class="float-left mt-1"><i class="fa fa-database"></i> Backup</h6>
+  </div>
+  <div class="card-body p-5">
+    <center>
+      <button class="btn btn-primary btn-lg"><i class="fa fa-download"></i> Download Database</button>
+    </center>
+  </div>
+</div>
+
+<?php include("footer.php");
\ No newline at end of file
diff --git a/settings-defaults.php b/settings-defaults.php
new file mode 100644
index 00000000..ce6089fa
--- /dev/null
+++ b/settings-defaults.php
@@ -0,0 +1,60 @@
+<?php include("header.php"); ?>
+
+<?php $sql = mysqli_query($mysqli,"SELECT * FROM accounts ORDER BY account_id DESC"); ?>
+
+<?php include("settings-nav.php"); ?>
+
+<div class="card mb-3">
+  <div class="card-header">
+    <h6 class="float-left mt-1"><i class="fa fa-cog"></i> Defaults Settings</h6>
+  </div>
+  <div class="card-body">
+    <form class="p-3" action="post.php" method="post" autocomplete="off">
+      <div class="form-group">
+        <label>Transfer From Account</label>
+        <div class="input-group">
+          <div class="input-group-prepend">
+            <span class="input-group-text"><i class="fa fa-server"></i></span>
+          </div>
+          <input type="text" class="form-control" name="smtp_host" placeholder="Mail Server Address" required autofocus>
+        </div>
+      </div>
+      
+      <div class="form-group">
+        <label>Transfer To Account</label>
+        <div class="input-group">
+          <div class="input-group-prepend">
+            <span class="input-group-text"><i class="fa fa-user"></i></span>
+          </div>
+          <input type="text" class="form-control" name="username" placeholder="Username" required>
+        </div>
+      </div>
+
+      <div class="form-group">
+        <label>Payment Account</label>
+        <div class="input-group">
+          <div class="input-group-prepend">
+            <span class="input-group-text"><i class="fa fa-user"></i></span>
+          </div>
+          <input type="text" class="form-control" name="username" placeholder="Username" required>
+        </div>
+      </div>
+
+      <div class="form-group mb-5">
+        <label>Expense Account</label>
+        <div class="input-group">
+          <div class="input-group-prepend">
+            <span class="input-group-text"><i class="fa fa-user"></i></span>
+          </div>
+          <input type="text" class="form-control" name="username" placeholder="Username" required>
+        </div>
+      </div>
+
+      <hr>
+      <button type="submit" name="add_client_contact" class="btn btn-primary">Save</button>
+        
+    </form>
+  </div>
+</div>
+
+<?php include("footer.php");
\ No newline at end of file
diff --git a/settings-general.php b/settings-general.php
new file mode 100644
index 00000000..b16565d0
--- /dev/null
+++ b/settings-general.php
@@ -0,0 +1,81 @@
+<?php include("header.php"); ?>
+
+<?php $sql = mysqli_query($mysqli,"SELECT * FROM accounts ORDER BY account_id DESC"); ?>
+
+<?php include("settings-nav.php"); ?>
+
+<div class="card mb-3">
+  <div class="card-header">
+    <h6 class="float-left mt-1"><i class="fa fa-building"></i> Company Settings</h6>
+  </div>
+  <div class="card-body">
+    <form class="p-3" action="post.php" method="post" autocomplete="off">
+      <div class="form-group">
+        <label>Company Name</label>
+        <div class="input-group">
+          <div class="input-group-prepend">
+            <span class="input-group-text"><i class="fa fa-building"></i></span>
+          </div>
+          <input type="text" class="form-control" name="name" placeholder="Company Name" required autofocus>
+        </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-map-marker"></i></span>
+          </div>
+          <input type="text" class="form-control" name="address" placeholder="Street Address" required>
+        </div>
+      </div>
+
+      <div class="form-group">
+        <label>City</label>
+        <input type="text" class="form-control" name="city" placeholder="City" required>
+      </div>
+
+      <div class="form-group">
+        <label>State</label>
+        <select class="form-control" name="state">
+          <option value="">Select a state...</option>
+          <?php foreach($states_array as $state_abbr => $state_name) { ?>
+          <option value="<?php echo $state_abbr; ?>"><?php echo $state_name; ?></option>
+          <?php } ?>
+        </select> 
+      </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-phone"></i></span>
+          </div>
+          <input type="text" class="form-control" name="phone" placeholder="Phone Number" data-inputmask="'mask': '999-999-9999'" required> 
+        </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-globe"></i></span>
+          </div>
+          <input type="text" class="form-control" name="site" placeholder="Website address https://" required>
+        </div>
+      </div>
+      
+      <div class="form-group mb-5">
+        <label>Logo</label>
+        <input type="file" class="form-control-file" name="logo">
+      </div>
+      
+      <hr>
+      
+      <button type="submit" name="add_client_contact" class="btn btn-primary">Save</button>
+        
+    </form>
+  </div>
+</div>
+
+<?php include("footer.php");
\ No newline at end of file
diff --git a/settings-invoice.php b/settings-invoice.php
new file mode 100644
index 00000000..e71af620
--- /dev/null
+++ b/settings-invoice.php
@@ -0,0 +1,66 @@
+<?php include("header.php"); ?>
+
+<?php $sql = mysqli_query($mysqli,"SELECT * FROM accounts ORDER BY account_id DESC"); ?>
+
+<?php include("settings-nav.php"); ?>
+
+<div class="card mb-3">
+  <div class="card-header">
+    <h6 class="float-left mt-1"><i class="fa fa-file"></i> Invoice Settings</h6>
+  </div>
+  <div class="card-body">
+    <form class="p-3" action="post.php" method="post" autocomplete="off"> 
+      
+      <div class="form-group">
+        <label>Next Number</label>
+        <div class="input-group">
+          <div class="input-group-prepend">
+            <span class="input-group-text"><i class="fa fa-barcode"></i></span>
+          </div>
+          <input type="text" class="form-control" name="next_number" placeholder="Next Invoice Number" required autofocus>
+        </div>
+      </div>
+      
+      <div class="form-group">
+        <label>Email From</label>
+        <div class="input-group">
+          <div class="input-group-prepend">
+            <span class="input-group-text"><i class="fa fa-envelope"></i></span>
+          </div>
+          <input type="email" class="form-control" name="email" placeholder="Email Address" required>
+        </div>
+      </div>
+
+      <div class="form-group">
+        <label>Email Name From</label>
+        <div class="input-group">
+          <div class="input-group-prepend">
+            <span class="input-group-text"><i class="fa fa-user"></i></span>
+          </div>
+          <input type="text" class="form-control" name="name_from" placeholder="Name" required>
+        </div>
+      </div>
+
+      <div class="form-group">
+        <label>Send Overdue Reminders</label>
+        <div class="input-group">
+          <div class="input-group-prepend">
+            <span class="input-group-text"><i class="fa fa-user"></i></span>
+          </div>
+          <input type="text" class="form-control" name="name_from" placeholder="Name" required>
+        </div>
+      </div>
+      
+      <div class="form-group mb-5">
+        <label>Logo</label>
+        <input type="file" class="form-control-file" name="logo">
+      </div>
+      
+      <hr>
+      <button type="submit" name="edit_settings_invoice" class="btn btn-primary">Save</button>        
+    
+    </form>
+  </div>
+</div>
+
+<?php include("footer.php");
\ No newline at end of file
diff --git a/settings-mail.php b/settings-mail.php
new file mode 100644
index 00000000..1b0c3815
--- /dev/null
+++ b/settings-mail.php
@@ -0,0 +1,50 @@
+<?php include("header.php"); ?>
+
+<?php $sql = mysqli_query($mysqli,"SELECT * FROM accounts ORDER BY account_id DESC"); ?>
+
+<?php include("settings-nav.php"); ?>
+
+<div class="card mb-3">
+  <div class="card-header">
+    <h6 class="float-left mt-1"><i class="fa fa-envelope"></i> Mail Settings</h6>
+  </div>
+  <div class="card-body">
+    <form class="p-3" action="post.php" method="post" autocomplete="off">
+      <div class="form-group">
+        <label>SMTP Host</label>
+        <div class="input-group">
+          <div class="input-group-prepend">
+            <span class="input-group-text"><i class="fa fa-server"></i></span>
+          </div>
+          <input type="text" class="form-control" name="smtp_host" placeholder="Mail Server Address" required autofocus>
+        </div>
+      </div>
+      
+      <div class="form-group">
+        <label>SMTP Username</label>
+        <div class="input-group">
+          <div class="input-group-prepend">
+            <span class="input-group-text"><i class="fa fa-user"></i></span>
+          </div>
+          <input type="text" class="form-control" name="username" placeholder="Username" required>
+        </div>
+      </div>
+
+      <div class="form-group mb-5">
+        <label>SMTP Password</label>
+        <div class="input-group">
+          <div class="input-group-prepend">
+            <span class="input-group-text"><i class="fa fa-lock"></i></span>
+          </div>
+          <input type="password" class="form-control" name="password" placeholder="Password" required>
+        </div>
+      </div>
+
+      <hr>
+      <button type="submit" name="add_client_contact" class="btn btn-primary">Save</button>
+        
+    </form>
+  </div>
+</div>
+
+<?php include("footer.php");
\ No newline at end of file
diff --git a/settings-nav.php b/settings-nav.php
new file mode 100644
index 00000000..0591efca
--- /dev/null
+++ b/settings-nav.php
@@ -0,0 +1,30 @@
+<ul class="nav nav-pills nav-fill mb-3">
+  <li class="nav-item">
+    <a class="nav-link active" href="settings-general.php">
+      <i class="fa fa-2x fa-building"></i><br>
+      Company
+    </a> 
+  </li>
+
+  <li class="nav-item">
+    <a class="nav-link" href="settings-mail.php">
+      <i class="fa fa-2x fa-envelope"></i><br>
+      Mail
+    </a> 
+  </li>
+
+  <li class="nav-item">
+    <a class="nav-link" href="settings-invoice.php">
+      <i class="fa fa-2x fa-file"></i><br>
+      Invoice
+    </a> 
+  </li>
+ 
+  <li class="nav-item">
+    <a class="nav-link" href="settings-backup.php">
+      <i class="fa fa-2x fa-database"></i><br>
+      Backup
+    </a> 
+  </li>
+
+</ul>
\ No newline at end of file