diff --git a/client_login_add_modal.php b/client_login_add_modal.php
index 00aab3e3..40cc6d27 100644
--- a/client_login_add_modal.php
+++ b/client_login_add_modal.php
@@ -225,7 +225,7 @@
                         <div class="tab-pane fade" id="pills-notes">
 
                             <div class="form-group">
-                                <textarea class="form-control" rows="8" placeholder="Enter some notes" name="note"></textarea>
+                                <textarea class="form-control" rows="12" placeholder="Enter some notes" name="note"></textarea>
                             </div>
 
                         </div>
diff --git a/client_login_edit_modal.php b/client_login_edit_modal.php
index dfe8ed53..49e08bbc 100644
--- a/client_login_edit_modal.php
+++ b/client_login_edit_modal.php
@@ -230,7 +230,7 @@
                         <div class="tab-pane fade" id="pills-notes<?php echo $login_id; ?>">
 
                             <div class="form-group">
-                                <textarea class="form-control" rows="8" placeholder="Enter some notes" name="note"><?php echo $login_note; ?></textarea>
+                                <textarea class="form-control" rows="12" placeholder="Enter some notes" name="note"><?php echo $login_note; ?></textarea>
                             </div>
 
                         </div>
diff --git a/client_logins.php b/client_logins.php
index 575ed27b..05fc667e 100644
--- a/client_logins.php
+++ b/client_logins.php
@@ -72,7 +72,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                         } ?>">
                     <tr>
                         <th><a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=login_name&order=<?php echo $disp; ?>">Name</a></th>
-                        <th><a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=login_description&order=<?php echo $disp; ?>">Description</a></th>
                         <th>Username</th>
                         <th>Password</th>
                         <th>OTP</th>
@@ -87,23 +86,18 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                         $login_id = intval($row['login_id']);
                         $login_name = nullable_htmlentities($row['login_name']);
                         $login_description = nullable_htmlentities($row['login_description']);
-                        if (empty($login_description)) {
-                            $login_description_display = "-";
-                        } else {
-                            $login_description_display = $login_description;
-                        }
                         $login_uri = nullable_htmlentities($row['login_uri']);
                         if (empty($login_uri)) {
                             $login_uri_display = "-";
                         } else {
-                            $login_uri_display = "$login_uri<button class='btn btn-sm clipboardjs' data-clipboard-text='$login_uri'><i class='far fa-copy text-secondary'></i></button><a href='$login_uri' target='_blank'><i class='fa fa-external-link-alt text-secondary'></i></a>";
+                            $login_uri_display = "$login_uri<button class='btn btn-sm clipboardjs' type='button' data-clipboard-text='$login_uri'><i class='far fa-copy text-secondary'></i></button>";
                         }
                         $login_uri_2 = nullable_htmlentities($row['login_uri_2']);
                         $login_username = nullable_htmlentities(decryptLoginEntry($row['login_username']));
                         if (empty($login_username)) {
                             $login_username_display = "-";
                         } else {
-                            $login_username_display = "$login_username<button class='btn btn-sm clipboardjs' data-clipboard-text='$login_username'><i class='far fa-copy text-secondary'></i></button>";
+                            $login_username_display = "$login_username<button class='btn btn-sm clipboardjs' type='button' data-clipboard-text='$login_username'><i class='far fa-copy text-secondary'></i></button>";
                         }
                         $login_password = nullable_htmlentities(decryptLoginEntry($row['login_password']));
                         $login_otp_secret = nullable_htmlentities($row['login_otp_secret']);
@@ -121,42 +115,51 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                         $login_software_id = intval($row['login_software_id']);
 
                     ?>
-                        <tr class="<?php if (!empty($login_important)) {
-                                        echo "text-bold";
-                                    } ?>">
+                        <tr class="<?php if (!empty($login_important)) { echo "text-bold"; } ?>">
                             <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; ?>
+                                    <div class="media">
+                                        <i class="fa fa-fw fa-2x fa-key mr-3"></i>
+                                        <div class="media-body">
+                                            <p>
+                                                <?php echo $login_name; ?>
+                                                <br>
+                                                <small class="text-secondary"><?php echo $login_description; ?></small>
+                                            </p>
+                                        </div>
+                                    </div>
                                 </a>
                             </td>
-                            <td><?php echo $login_description_display; ?></td>
                             <td><?php echo $login_username_display; ?></td>
                             <td>
-                                <a tabindex="0" href="#" data-toggle="popover" data-trigger="focus" data-placement="top" data-content="<?php echo $login_password; ?>"><i class="fas fa-2x fa-ellipsis-h text-secondary"></i><i class="fas fa-2x fa-ellipsis-h text-secondary"></i></a><button class="btn btn-sm clipboardjs" data-clipboard-text="<?php echo $login_password; ?>"><i class="far fa-copy text-secondary"></i></button>
+                                <button class="btn p-0" type="button" data-toggle="popover" data-trigger="focus" data-placement="top" data-content="<?php echo $login_password; ?>"><i class="fas fa-2x fa-ellipsis-h text-secondary"></i><i class="fas fa-2x fa-ellipsis-h text-secondary"></i></button><button class="btn btn-sm clipboardjs" type="button" data-clipboard-text="<?php echo $login_password; ?>"><i class="far fa-copy text-secondary"></i></button>
                             </td>
                             <td><?php echo $otp_display; ?></td>
                             <td><?php echo $login_uri_display; ?></td>
-                            <td>
-                                <div class="dropdown dropleft text-center">
-                                    <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">
-                                        <i class="fas fa-ellipsis-h"></i>
-                                    </button>
-                                    <div class="dropdown-menu">
-                                        <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editLoginModal<?php echo $login_id; ?>">
-                                            <i class="fas fa-fw fa-edit mr-2"></i>Edit
-                                        </a>
-                                        <a class="dropdown-item" href="#" data-toggle="modal" data-target="#shareModal" onclick="populateShareModal(<?php echo "$client_id, 'Login', $login_id"; ?>)">
-                                            <i class="fas fa-fw fa-share mr-2"></i>Share
-                                        </a>
-                                        <?php if ($session_user_role == 3) { ?>
-                                            <div class="dropdown-divider"></div>
-                                            <a class="dropdown-item text-danger text-bold" href="post.php?delete_login=<?php echo $login_id; ?>">
-                                                <i class="fas fa-fw fa-trash mr-2"></i>Delete
+                            <td class="text-center">
+                                <div class="btn-group">
+                                    <?php if ($login_uri) { ?>
+                                    <a href='$login_uri' target='_blank' class="btn btn-default btn-sm"><i class='fa fa-fw fa-external-link-alt'></i></a>
+                                    <?php } ?>
+                                    <div class="dropdown dropleft text-center">
+                                        <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">
+                                            <i class="fas fa-ellipsis-h"></i>
+                                        </button>
+                                        <div class="dropdown-menu">
+                                            <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editLoginModal<?php echo $login_id; ?>">
+                                                <i class="fas fa-fw fa-edit mr-2"></i>Edit
                                             </a>
-                                        <?php } ?>
+                                            <a class="dropdown-item" href="#" data-toggle="modal" data-target="#shareModal" onclick="populateShareModal(<?php echo "$client_id, 'Login', $login_id"; ?>)">
+                                                <i class="fas fa-fw fa-share mr-2"></i>Share
+                                            </a>
+                                            <?php if ($session_user_role == 3) { ?>
+                                                <div class="dropdown-divider"></div>
+                                                <a class="dropdown-item text-danger text-bold" href="post.php?delete_login=<?php echo $login_id; ?>">
+                                                    <i class="fas fa-fw fa-trash mr-2"></i>Delete
+                                                </a>
+                                            <?php } ?>
+                                        </div>
                                     </div>
-                                </div>
                             </td>
                         </tr>