diff --git a/accounts.php b/accounts.php
index 57be8799..73de1f22 100644
--- a/accounts.php
+++ b/accounts.php
@@ -11,7 +11,7 @@
   <div class="card-body">
     <div class="table-responsive">
       <table class="table table-striped table-borderless table-hover" id="dataTable" width="100%" cellspacing="0">
-        <thead>
+        <thead class="thead-dark">
           <tr>
             <th>Name</th>
             <th class="text-right">Balance</th>
diff --git a/add_account_modal.php b/add_account_modal.php
index 71ff282e..a632948d 100644
--- a/add_account_modal.php
+++ b/add_account_modal.php
@@ -13,7 +13,7 @@
             <label>Account Name</label>
             <div class="input-group">
               <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-university"></i></span>
+                <span class="input-group-text"><i class="fa fa-fw fa-piggy-bank"></i></span>
               </div>
               <input type="text" class="form-control" name="name" placeholder="Account name" required autofocus>
             </div>
diff --git a/add_client_modal.php b/add_client_modal.php
index 3cc93e4c..996cb684 100644
--- a/add_client_modal.php
+++ b/add_client_modal.php
@@ -35,7 +35,7 @@
             <div class="form-group col-md-4">
               <label>State</label>
               <select class="form-control" name="state">
-                <option value="">Select a state...</option>
+                <option value="">- State -</option>
                 <?php foreach($states_array as $state_abbr => $state_name) { ?>
                 <option value="<?php echo $state_abbr; ?>"><?php echo $state_name; ?></option>
                 <?php } ?>
diff --git a/add_expense_modal.php b/add_expense_modal.php
index 9ad1d2f4..5bcccd38 100644
--- a/add_expense_modal.php
+++ b/add_expense_modal.php
@@ -25,7 +25,7 @@
                 <div class="input-group-prepend">
                   <span class="input-group-text"><i class="fa fa-fw fa-dollar-sign"></i></span>
                 </div>
-                <input type="number" class="form-control" step="0.01" name="amount" autofocus="autofocus" required>
+                <input type="number" class="form-control" step="0.01" name="amount" placeholder="Enter amount" autofocus required>
               </div>
             </div>
             <div class="form-group col-md">
diff --git a/add_vendor_modal.php b/add_vendor_modal.php
index ebb919c2..d3bfe563 100644
--- a/add_vendor_modal.php
+++ b/add_vendor_modal.php
@@ -29,7 +29,7 @@
             <div class="form-group col">
               <label>State</label>
               <select class="form-control" name="state">
-                <option value="">Select a state...</option>
+                <option value="">- State -</option>
                 <?php foreach($states_array as $state_abbr => $state_name) { ?>
                 <option value="<?php echo $state_abbr; ?>"><?php echo $state_name; ?></option>
                 <?php } ?>
diff --git a/client.php b/client.php
index bd61a0f1..ef87f868 100644
--- a/client.php
+++ b/client.php
@@ -95,11 +95,24 @@ if(isset($_GET['client_id'])){
       </div>
       <div class="col border-right">
         <h4 class="text-secondary">Contact</h4>
-        <i class="fa fa-fw fa-envelope text-secondary ml-1 mr-2"></i> <a href="mailto:<?php echo $client_email; ?>"><?php echo $client_email; ?></a>
+        <?php
+        if(!empty($client_email)){
+        ?>
+        <i class="fa fa-fw fa-envelope text-secondary ml-1 mr-2 mb-2"></i> <a href="mailto:<?php echo $client_email; ?>"><?php echo $client_email; ?></a>
         <br>
-        <i class="fa fa-fw fa-phone text-secondary ml-1 mr-2"></i> <?php echo $client_phone; ?>
+        <?php
+        }
+        ?>
+
+        <i class="fa fa-fw fa-phone text-secondary ml-1 mr-2 mb-2"></i> <?php echo $client_phone; ?>
         <br>
-        <i class="fa fa-fw fa-globe text-secondary ml-1 mr-2"></i> <a target="_blank" href="//<?php echo $client_website; ?>"><?php echo $client_website; ?></a>
+        <?php
+        if(!empty($client_website)){
+        ?>
+        <i class="fa fa-fw fa-globe text-secondary ml-1 mr-2 mb-2"></i> <a target="_blank" href="//<?php echo $client_website; ?>"><?php echo $client_website; ?></a>
+        <?php 
+        }
+        ?>
       </div>
       <div class="col border-right">
         <h4 class="text-secondary">Standings</h4>
diff --git a/dashboard.php b/dashboard.php
index cf4d8372..3da7bd84 100644
--- a/dashboard.php
+++ b/dashboard.php
@@ -111,7 +111,6 @@ $sql_latest_expenses = mysqli_query($mysqli,"SELECT * FROM expenses, vendors, ca
       <div class="card-body">
         <canvas id="myAreaChart" width="100%" height="25"></canvas>
       </div>
-      <div class="card-footer"></div>
     </div>
   </div>
 
@@ -124,7 +123,6 @@ $sql_latest_expenses = mysqli_query($mysqli,"SELECT * FROM expenses, vendors, ca
       <div class="card-body">
         <canvas id="incomeByCategoryPieChart" width="100%" height="60"></canvas>
       </div>
-      <div class="card-footer small text-muted">Updated yesterday at 11:59 PM</div>
     </div>
   </div>
 
@@ -137,7 +135,6 @@ $sql_latest_expenses = mysqli_query($mysqli,"SELECT * FROM expenses, vendors, ca
       <div class="card-body">
         <canvas id="expenseByCategoryPieChart" width="100%" height="60"></canvas>
       </div>
-      <div class="card-footer small text-muted">Updated yesterday at 11:59 PM</div>
     </div>
   </div>
 
diff --git a/edit_client_modal.php b/edit_client_modal.php
index f93058fc..9ff37f7c 100644
--- a/edit_client_modal.php
+++ b/edit_client_modal.php
@@ -50,7 +50,7 @@
             <label class="col-sm-2 col-form-label">State</label>
             <div class="col-sm-10">
               <select class="form-control" name="state" required>
-                <option value="">Select a state...</option>
+                <option value="">- State -</option>
                   <?php 
                   foreach($states_array as $state_abbr => $state_name){ 
                   ?>
diff --git a/expenses.php b/expenses.php
index cc422acb..22987a95 100644
--- a/expenses.php
+++ b/expenses.php
@@ -17,7 +17,7 @@
   <div class="card-body">
     <div class="table-responsive">
       <table class="table table-striped table-borderless table-hover" id="dataTable" width="100%" cellspacing="0">
-        <thead>
+        <thead class="thead-dark">
           <tr>
             <th>Date</th>
             <th class="text-right">Amount</th>
diff --git a/mileage.php b/mileage.php
index f953758f..b25e5a54 100644
--- a/mileage.php
+++ b/mileage.php
@@ -11,7 +11,7 @@
   <div class="card-body">
     <div class="table-responsive">
       <table class="table table-striped table-borderless table-hover" id="dataTable" width="100%" cellspacing="0">
-        <thead>
+        <thead class="thead-dark">
           <tr>
             <th>Date</th>
             <th>Purpose</th>
diff --git a/payments.php b/payments.php
index 5ee1fc5e..fae1f91c 100644
--- a/payments.php
+++ b/payments.php
@@ -17,7 +17,7 @@
   <div class="card-body">
     <div class="table-responsive">
       <table class="table table-striped table-borderless table-hover" id="dataTable" width="100%" cellspacing="0">
-        <thead>
+        <thead class="thead-dark">
           <tr>
             <th>Date</th>
             <th>Invoice</th>
diff --git a/quotes.php b/quotes.php
index 4fd36c3b..24d94ed4 100644
--- a/quotes.php
+++ b/quotes.php
@@ -15,7 +15,7 @@
   <div class="card-body">
     <div class="table-responsive">
       <table class="table table-striped table-borderless table-hover" id="dataTable" width="100%" cellspacing="0">
-        <thead>
+        <thead class="thead-dark">
           <tr>
             <th>Number</th>
             <th>Client</th>
diff --git a/recurring.php b/recurring.php
index d84b9ffd..e3e11a7a 100644
--- a/recurring.php
+++ b/recurring.php
@@ -16,7 +16,7 @@
   <div class="card-body">
     <div class="table-responsive">
       <table class="table table-striped table-borderless table-hover" id="dataTable" width="100%" cellspacing="0">
-        <thead>
+        <thead class="thead-dark">
           <tr>
             <th>Frequency</th>
             <th>Client</th>
diff --git a/report_expense_summary.php b/report_expense_summary.php
index aad12e60..64352f99 100644
--- a/report_expense_summary.php
+++ b/report_expense_summary.php
@@ -15,8 +15,8 @@ $sql_categories = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_
 
 <div class="card mb-3">
   <div class="card-header">
-    <h6 class="float-left mt-1"><i class="fa fa-coins"></i> Expense Summary</h6>
-    <button type="button" class="btn btn-primary btn-sm float-right d-print-none" onclick="window.print();"><i class="fas fa-print"></i> Print</button>
+    <h6 class="float-left mt-1"><i class="fa fa-fw fa-coins mr-2"></i>Expense Summary</h6>
+    <button type="button" class="btn btn-primary btn-sm float-right d-print-none" onclick="window.print();"><i class="fas fa-fw fa-print"></i> Print</button>
     <form>
       <select onchange="this.form.submit()" class="form-control mt-5" name="year">
         <?php 
diff --git a/report_income_summary.php b/report_income_summary.php
index d86139d5..9e336408 100644
--- a/report_income_summary.php
+++ b/report_income_summary.php
@@ -15,8 +15,8 @@ $sql_categories = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_
 
 <div class="card mb-3">
   <div class="card-header">
-    <h6 class="float-left mt-1"><i class="fa fa-coins"></i> Income Summary</h6>
-    <button type="button" class="btn btn-primary btn-sm float-right d-print-none" onclick="window.print();"><i class="fas fa-print"></i> Print</button>
+    <h6 class="float-left mt-1"><i class="fa fa-fw fa-coins mr-2"></i>Income Summary</h6>
+    <button type="button" class="btn btn-primary btn-sm float-right d-print-none" onclick="window.print();"><i class="fas fa-fw fa-print"></i> Print</button>
     <form>
       <select onchange="this.form.submit()" class="form-control mt-5" name="year">
         <?php 
diff --git a/report_profit_loss.php b/report_profit_loss.php
index f2832bc4..fac65517 100644
--- a/report_profit_loss.php
+++ b/report_profit_loss.php
@@ -20,8 +20,8 @@ $sql_categories_expense = mysqli_query($mysqli,"SELECT * FROM categories WHERE c
 
 <div class="card mb-3">
   <div class="card-header">
-    <h6 class="float-left mt-1"><i class="fa fa-balance-scale"></i> Profit & Loss</h6>
-    <button type="button" class="btn btn-primary btn-sm float-right d-print-none" onclick="window.print();"><i class="fas fa-print"></i> Print</button>
+    <h6 class="float-left mt-1"><i class="fa fw-fw fa-balance-scale mr-2"></i>Profit & Loss</h6>
+    <button type="button" class="btn btn-primary btn-sm float-right d-print-none" onclick="window.print();"><i class="fas fa-fw fa-print"></i> Print</button>
     <form>
       <select onchange="this.form.submit()" class="form-control mt-5" name="year">
         <?php 
diff --git a/transfers.php b/transfers.php
index aac5d7ac..de24a050 100644
--- a/transfers.php
+++ b/transfers.php
@@ -15,7 +15,7 @@ $sql = mysqli_query($mysqli,"SELECT * FROM transfers ORDER BY transfer_date DESC
   <div class="card-body">
     <div class="table-responsive">
       <table class="table table-striped table-borderless table-hover" id="dataTable" width="100%" cellspacing="0">
-        <thead>
+        <thead class="thead-dark">
           <tr>
             <th>Date</th>
             <th>From Account</th>
diff --git a/vendors.php b/vendors.php
index b93c96ff..b4cbe2ae 100644
--- a/vendors.php
+++ b/vendors.php
@@ -11,7 +11,7 @@
   <div class="card-body">
     <div class="table-responsive">
       <table class="table table-striped table-borderless table-hover" id="dataTable" width="100%" cellspacing="0">
-        <thead>
+        <thead class="thead-dark">
           <tr>
             <th>Vendor</th>
             <th>Description</th>