diff --git a/logs.php b/logs.php
index d04011db..e9940790 100644
--- a/logs.php
+++ b/logs.php
@@ -48,10 +48,10 @@ if(!empty($_GET['dtf'])){
 //Rebuild URL
 $url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
 
-$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM logs 
+$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM logs, users 
   WHERE (log_type LIKE '%$q%' OR log_action LIKE '%$q%' OR log_description LIKE '%$q%')
   AND DATE(log_created_at) BETWEEN '$dtf' AND '$dtt'
-  AND (user_id IS NULL)
+  AND (logs.user_id = users.user_id AND logs.user_id IS NULL)
   ORDER BY $sb $o LIMIT $record_from, $record_to");
 
 $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
@@ -98,6 +98,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
         <thead class="text-dark <?php if($num_rows[0] == 0){ echo "d-none"; } ?>">
           <tr>
             <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=log_created_at&o=<?php echo $disp; ?>">Timestamp</a></th>
+            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=name&o=<?php echo $disp; ?>">User</a></th>
             <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=log_type&o=<?php echo $disp; ?>">Type</a></th>
             <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=log_action&o=<?php echo $disp; ?>">Action</a></th>
             <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=log_description&o=<?php echo $disp; ?>">Description</a></th>
@@ -112,11 +113,17 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
             $log_action = $row['log_action'];
             $log_description = $row['log_description'];
             $log_created_at = $row['log_created_at'];
+            $user_id = $row['user_id'];
+            $name = $row['name'];
+            if($user_id == 0){
+              $name = "-";
+            }
           
           ?>
           
           <tr>
             <td><?php echo $log_created_at; ?></td>
+            <td><?php echo $name; ?></td>
             <td><?php echo $log_type; ?></td>
             <td><?php echo $log_action; ?></td>
             <td><?php echo $log_description; ?></td>
diff --git a/setup.php b/setup.php
index ec21ad83..a311acda 100644
--- a/setup.php
+++ b/setup.php
@@ -290,7 +290,7 @@ if(isset($_POST['add_company_settings'])){
       
       <!-- Brand Logo -->
       <a href="https://itflow.org" class="brand-link">
-        <span class="brand-text font-weight-light">ITFlow</span>
+        <h3 class="brand-text font-weight-light">ITFlow</h3>
       </a>
 
       <!-- Sidebar -->
@@ -376,7 +376,7 @@ if(isset($_POST['add_company_settings'])){
                     <div class="input-group-prepend">
                       <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
                     </div>
-                    <input type="text" class="form-control" name="username" placeholder="Username to access the database" autofocus required>
+                    <input type="text" class="form-control" name="username" placeholder="Database User" autofocus required>
                   </div>
                 </div>
 
@@ -386,7 +386,7 @@ if(isset($_POST['add_company_settings'])){
                     <div class="input-group-prepend">
                       <span class="input-group-text"><i class="fa fa-fw fa-lock"></i></span>
                     </div>
-                    <input type="password" class="form-control" name="password" placeholder="Enter the Datbase password" required>
+                    <input type="password" class="form-control" name="password" placeholder="Database Password" required>
                   </div>
                 </div>
 
@@ -396,7 +396,7 @@ if(isset($_POST['add_company_settings'])){
                     <div class="input-group-prepend">
                       <span class="input-group-text"><i class="fa fa-fw fa-database"></i></span>
                     </div>
-                    <input type="text" class="form-control" name="database" placeholder="Name of the database" required>
+                    <input type="text" class="form-control" name="database" placeholder="Database Name" required>
                   </div>
                 </div>
 
@@ -583,7 +583,7 @@ if(isset($_POST['add_company_settings'])){
                 
                 <hr>
                 
-                <button type="submit" name="add_company_settings" class="btn btn-primary">Finish and Login <i class="fa fa-fw fa-checkmark"></i></button>
+                <button type="submit" name="add_company_settings" class="btn btn-primary">Finish and Login <i class="fa fa-fw fa-check-circle"></i></button>
                   
               </form>
             </div>
@@ -593,7 +593,7 @@ if(isset($_POST['add_company_settings'])){
 
           <div class="card card-dark">
             <div class="card-header">
-              <h3 class="card-title"><i class="fa fa-fw fa-box"></i> Welcome to ITFlow Setup</h3>
+              <h3 class="card-title"><i class="fa fa-fw fa-cube"></i> Welcome to ITFlow Setup</h3>
             </div>
             <div class="card-body">
               <p>Click on the install button to start the install process, you must create a database before proceeding</p>
@@ -607,7 +607,7 @@ if(isset($_POST['add_company_settings'])){
                 <li>Get List of Emails in CSV to export to a mailing list</li>
                 <li>Acquire balance can be useful for customer's to get their balance by phone</li>
               </ul>
-              <center><a href="?database" class="btn btn-lg btn-primary p-5 mb-5"><i class="fa fa-fw fa-checkmark"></i><br><br>Install</a></center>
+              <center><a href="?database" class="btn btn-lg btn-primary">Install <i class="fa fa-fw fa-arrow-alt-circle-right"></i></a></center>
             </div>
           </div>