diff --git a/client_logins.php b/client_logins.php
index 5bf532ea..2eeeb62a 100644
--- a/client_logins.php
+++ b/client_logins.php
@@ -26,7 +26,21 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
     <div class="card-header py-2">
         <h3 class="card-title mt-2"><i class="fa fa-fw fa-key mr-2"></i>Passwords</h3>
         <div class="card-tools">
-            <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addLoginModal"><i class="fas fa-plus mr-2"></i>Create</button>
+            <div class="btn-group">
+                <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addLoginModal">
+                    <i class="fas fa-plus mr-2"></i>Create
+                </button>
+                <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
+                <div class="dropdown-menu">
+                    <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#importLoginModal">
+                        <i class="fa fa-fw fa-upload mr-2"></i>Import
+                    </a>
+                    <div class="dropdown-divider"></div>
+                    <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#exportLoginModal">
+                        <i class="fa fa-fw fa-download mr-2"></i>Export
+                    </a>
+                </div>
+            </div>
         </div>
     </div>
     <div class="card-body">
@@ -45,8 +59,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
                 <div class="col-md-8">
                     <div class="float-right">
-                        <button type="button" class="btn btn-default" data-toggle="modal" data-target="#exportLoginModal"><i class="fa fa-fw fa-download mr-2"></i>Export</button>
-                        <button type="button" class="btn btn-default" data-toggle="modal" data-target="#importLoginModal"><i class="fa fa-fw fa-upload mr-2"></i>Import</button>
                     </div>
                 </div>
 
diff --git a/client_software.php b/client_software.php
index 5338f124..141ce5c3 100644
--- a/client_software.php
+++ b/client_software.php
@@ -16,7 +16,7 @@ $sql = mysqli_query(
     LEFT JOIN logins ON login_software_id = software_id
     WHERE software_client_id = $client_id
     AND software_template = 0
-    AND software_archived_at IS NULL
+    AND software_$archive_query
     AND (software_name LIKE '%$q%' OR software_type LIKE '%$q%' OR software_key LIKE '%$q%')
     ORDER BY $sort $order LIMIT $record_from, $record_to");
 
@@ -26,7 +26,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
     <div class="card card-dark">
         <div class="card-header py-2">
-            <h3 class="card-title mt-2"><i class="fas fa-fw fa-certificate mr-2"></i>Licenses</h3>
+            <h3 class="card-title mt-2"><i class="fas fa-fw fa-certificate mr-2"></i>Software & Licenses</h3>
             <div class="card-tools">
                 <div class="btn-group">
                     <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addSoftwareModal">
@@ -34,7 +34,13 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     </button>
                     <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
                     <div class="dropdown-menu">
-                        <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#addSoftwareFromTemplateModal">From Template</a>
+                        <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#addSoftwareFromTemplateModal">
+                            <i class="fas fa-fw fa-puzzle-piece mr-2"></i>Create from Template
+                        </a>
+                        <div class="dropdown-divider"></div>
+                        <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#exportSoftwareModal">
+                            <i class="fa fa-fw fa-download mr-2"></i>Export
+                        </a>
                     </div>
                 </div>
             </div>
@@ -42,6 +48,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
         <div class="card-body">
             <form autocomplete="off">
                 <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
+                <input type="hidden" name="archived" value="<?php echo $archived; ?>">
                 <div class="row">
 
                     <div class="col-md-4">
@@ -55,7 +62,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
                     <div class="col-md-8">
                         <div class="float-right">
-                            <button type="button" class="btn btn-default" data-toggle="modal" data-target="#exportSoftwareModal"><i class="fa fa-fw fa-download mr-2"></i>Export</button>
+                            <?php if($archived == 1){ ?>
+                            <a href="?client_id=<?php echo $client_id; ?>&archived=0" class="btn btn-primary"><i class="fa fa-fw fa-archive mr-2"></i>Archived</a>
+                            <?php } else { ?>
+                            <a href="?client_id=<?php echo $client_id; ?>&archived=1" class="btn btn-default"><i class="fa fa-fw fa-archive mr-2"></i>Archived</a>
+                            <?php } ?>
                         </div>
                     </div>