diff --git a/add_client_modal.php b/add_client_modal.php
index 91d8058b..7f221f03 100644
--- a/add_client_modal.php
+++ b/add_client_modal.php
@@ -210,7 +210,7 @@
                   <div class="input-group-prepend">
                     <span class="input-group-text"><i class="fa fa-fw fa-globe"></i></span>
                   </div>
-                  <input type="url" class="form-control" name="website" placeholder="ex. https://google.com">
+                  <input type="text" class="form-control" name="website" placeholder="ex. google.com">
                 </div>
               </div>
             
diff --git a/add_login_modal.php b/add_login_modal.php
index 7c7b927e..b155af83 100644
--- a/add_login_modal.php
+++ b/add_login_modal.php
@@ -63,12 +63,12 @@
               </div>
 
               <div class="form-group">
-                <label>URI</label>
+                <label>URL/Host</label>
                 <div class="input-group">
                   <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-globe"></i></span>
+                    <span class="input-group-text"><i class="fa fa-fw fa-link"></i></span>
                   </div>
-                  <input type="url" class="form-control" name="uri" placeholder="ex. https://google.com">
+                  <input type="text" class="form-control" name="uri" placeholder="ex. google.com">
                 </div>
               </div>
 
diff --git a/client_logins.php b/client_logins.php
index 1b26c93d..ea4b6224 100644
--- a/client_logins.php
+++ b/client_logins.php
@@ -74,6 +74,7 @@ $total_pages = ceil($total_found_rows / 10);
         <thead class="text-dark <?php if($num_rows[0] == 0){ echo "d-none"; } ?>">
           <tr>
             <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=login_name&o=<?php echo $disp; ?>">Name</a></th>
+            <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=login_uri&o=<?php echo $disp; ?>">URL/Host</a></th>
             <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=login_username&o=<?php echo $disp; ?>">Username</a></th>
             <th>Password</th>
             <th class="text-center">Action</th>
@@ -86,6 +87,9 @@ $total_pages = ceil($total_found_rows / 10);
             $login_id = $row['login_id'];
             $login_name = $row['login_name'];
             $login_uri = $row['login_uri'];
+            if(empty($login_uri)){
+              $login_uri = "N/A";
+            }
             $login_username = $row['login_username'];
             $login_password = $row['login_password'];
             $login_note = $row['login_note'];
@@ -97,11 +101,11 @@ $total_pages = ceil($total_found_rows / 10);
           <tr>
             <td>
               <i class="fa fa-fw fa-key text-secondary"></i> 
-              <a class="text-dark" href="#" data-toggle="modal" data-target="#editLoginModal<?php echo $login_id; ?>"><?php echo $login_name; ?></a>
-              <br>
-              <small class="text-secondary"><?php echo $login_uri; ?></small>
-
+              <a class="text-dark" href="#" data-toggle="modal" data-target="#editLoginModal<?php echo $login_id; ?>">
+                <?php echo $login_name; ?>
+              </a>
             </td>
+            <td><?php echo $login_uri; ?>
             <td><?php echo $login_username; ?></td>
             <td><?php echo $login_password; ?></td>
             <td>
@@ -110,7 +114,6 @@ $total_pages = ceil($total_found_rows / 10);
                   <i class="fas fa-ellipsis-h"></i>
                 </button>
                 <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
-                  <?php if(!empty($login_uri)){ ?> <a class="dropdown-item" href="<?php echo $login_uri; ?>" target='_blank'><i class="fa fa-link"></i> Open URI</a> <?php } ?>
                   <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editLoginModal<?php echo $login_id; ?>">Edit</a>
                   <a class="dropdown-item" href="post.php?delete_login=<?php echo $login_id; ?>">Delete</a>
                 </div>
diff --git a/dashboard.php b/dashboard.php
index fba08409..c4afc506 100644
--- a/dashboard.php
+++ b/dashboard.php
@@ -556,7 +556,7 @@ var myLineChart = new Chart(ctx, {
       yAxes: [{
         ticks: {
           min: 0,
-          max: <?php $max = max($largest_expense_month, $largest_income_month, $largest_invoice_month); echo roundUpToNearestMultiple($max); ?>,
+          max: <?php $max = max(1000, $largest_expense_month, $largest_income_month, $largest_invoice_month); echo roundUpToNearestMultiple($max); ?>,
           maxTicksLimit: 5
         },
         gridLines: {
diff --git a/edit_client_modal.php b/edit_client_modal.php
index dc05974b..6df769c3 100644
--- a/edit_client_modal.php
+++ b/edit_client_modal.php
@@ -211,7 +211,7 @@
                   <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="ex. https://google.com" value="<?php echo $client_website; ?>">
+                  <input type="text" class="form-control" name="website" placeholder="ex. google.com" value="<?php echo $client_website; ?>">
                 </div>
               </div>
             
diff --git a/edit_login_modal.php b/edit_login_modal.php
index a6c7b59e..0d93123a 100644
--- a/edit_login_modal.php
+++ b/edit_login_modal.php
@@ -66,12 +66,12 @@
               </div>
 
               <div class="form-group">
-                <label>URI</label>
+                <label>URL/Host</label>
                 <div class="input-group">
                   <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-globe"></i></span>
+                    <span class="input-group-text"><i class="fa fa-fw fa-link"></i></span>
                   </div>
-                  <input type="url" class="form-control" name="uri" placeholder="ex. https://google.com" value="<?php echo $login_uri; ?>">
+                  <input type="text" class="form-control" name="uri" placeholder="ex. google.com" value="<?php echo $login_uri; ?>">
                   <div class="input-group-append">
                     <span class="input-group-text"><i class="fa fa-fw fa-link"></i></span>
                   </div>