diff --git a/app/templates/admin/admin_cloud.html b/app/templates/admin/admin_cloud.html
index e093cc5..a96cb25 100644
--- a/app/templates/admin/admin_cloud.html
+++ b/app/templates/admin/admin_cloud.html
@@ -1,3 +1,5 @@
-    <button class="btn btn-success btn-md" onclick="window.open('{{ url_for('admin.list_deployments') }}','_self')"><span class="glyphicon glyphicon-hdd" aria-hidden="true"></span> Deployments</button>
     <button class="btn btn-primary btn-md" onclick="window.open('{{ url_for('admin.list_servers') }}','_self')"><span class="glyphicon glyphicon-off" aria-hidden="true"></span> Servers</button>
+    <button class="btn btn-success btn-md" onclick="window.open('{{ url_for('admin.list_deployments') }}','_self')"><span class="glyphicon glyphicon-hdd" aria-hidden="true"></span> Deploys</button>
     <button class="btn btn-primary btn-md" onclick="window.open('{{ url_for('admin.list_addresses') }}','_self')"><span class="glyphicon glyphicon-tag" aria-hidden="true"></span> Addresses</button>
+    <button class="btn btn-success btn-md" onclick="window.open('{{ url_for('admin.list_services') }}','_self')"><span class="glyphicon glyphicon-star" aria-hidden="true"></span> Services</button>
+
diff --git a/app/templates/admin/admin_misc.html b/app/templates/admin/admin_misc.html
index 80760a6..c7c61d5 100644
--- a/app/templates/admin/admin_misc.html
+++ b/app/templates/admin/admin_misc.html
@@ -1,4 +1,3 @@
-    <button class="btn btn-success btn-md" onclick="window.open('{{ url_for('admin.list_services') }}','_self')"><span class="glyphicon glyphicon-star" aria-hidden="true"></span> Services</button>
-    <button class="btn btn-success btn-md" onclick="window.open('{{ url_for('admin.list_domains') }}','_self')"><span class="glyphicon glyphicon-home" aria-hidden="true"></span> Domains</button>
     <button class="btn btn-primary btn-md" onclick="window.open('{{ url_for('admin.list_users') }}','_self')"><span class="glyphicon glyphicon-user" aria-hidden="true"></span> Users</button>
     <button class="btn btn-primary btn-md" onclick="window.open('{{ url_for('admin.list_transactions') }}','_self')"><span class="glyphicon glyphicon-btc" aria-hidden="true"></span> Transactions</button>
+    <button class="btn btn-primary btn-md" onclick="window.open('{{ url_for('admin.list_archive') }}','_self')"><span class="glyphicon glyphicon-book" aria-hidden="true"></span> Archive</button>
diff --git a/app/templates/admin/admin_tasks.html b/app/templates/admin/admin_tasks.html
index 1caf773..2a872e5 100644
--- a/app/templates/admin/admin_tasks.html
+++ b/app/templates/admin/admin_tasks.html
@@ -1,4 +1,4 @@
-  <div class="col-md-6"> 
+  <div class="col-md-7"> 
   <div class="panel panel-warning" id="prxadmincloud"> 
   <div class="panel-heading">Cloud Manager</div> 
   <div class="panel-body">
@@ -7,7 +7,7 @@
   </div>
   </div>
 
-  <div class="col-md-6"> 
+  <div class="col-md-5"> 
   <div class="panel panel-warning" id="prxadminmisc"> 
   <div class="panel-heading">Misc</div> 
   <div class="panel-body">
diff --git a/app/vmanager/routes.py b/app/vmanager/routes.py
index deb46ab..cd7f898 100644
--- a/app/vmanager/routes.py
+++ b/app/vmanager/routes.py
@@ -184,6 +184,9 @@ def remove(unit_id=0):
             try:
                 #pubvlans depends on deploy as foreign key so delete them first
                 for pubvlan in deploy.inv_pubvlans:
+                    pubvlan.pubaddr.pubvlan_id = None
+                    pubvlan.pubaddr.user_id = None
+                    db.session.commit()
                     db.session.delete(pubvlan)
                     db.session.commit()