diff --git a/app/models.py b/app/models.py
index 20c4aba..86357be 100644
--- a/app/models.py
+++ b/app/models.py
@@ -231,6 +231,7 @@ class Order(db.Model):
     __tablename__ = 'orders'
     pid = db.Column(db.Integer, primary_key=True)
     user_id = db.Column(db.ForeignKey('users.pid')) #FK
+    status = db.Column(db.String)
     recipe_id = db.Column(db.ForeignKey('recipes.pid')) #FK
     parameter1 = db.Column(db.String)
     parameter2 = db.Column(db.String)
diff --git a/app/templates/admin/admin_cloud.html b/app/templates/admin/admin_cloud.html
index a96cb25..4dfee05 100644
--- a/app/templates/admin/admin_cloud.html
+++ b/app/templates/admin/admin_cloud.html
@@ -1,5 +1,5 @@
-    <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>
+    <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>
 
diff --git a/app/templates/admin/admin_misc.html b/app/templates/admin/admin_misc.html
index c7c61d5..f904e4a 100644
--- a/app/templates/admin/admin_misc.html
+++ b/app/templates/admin/admin_misc.html
@@ -1,3 +1,2 @@
     <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 2a872e5..a41d36c 100644
--- a/app/templates/admin/admin_tasks.html
+++ b/app/templates/admin/admin_tasks.html
@@ -1,18 +1,9 @@
-  <div class="col-md-7"> 
+  <div class="col-md-12"> 
   <div class="panel panel-warning" id="prxadmincloud"> 
-  <div class="panel-heading">Cloud Manager</div> 
+  <div class="panel-heading">Admin Panel</div> 
   <div class="panel-body">
   {% include "admin/admin_cloud.html" %}
   </div>
   </div>
   </div>
 
-  <div class="col-md-5"> 
-  <div class="panel panel-warning" id="prxadminmisc"> 
-  <div class="panel-heading">Misc</div> 
-  <div class="panel-body">
-  {% include "admin/admin_misc.html" %}
-  </div>
-  </div>
-  </div>
-
diff --git a/app/templates/admin/list_deployments.html b/app/templates/admin/list_deployments.html
index 3773538..bdc421f 100644
--- a/app/templates/admin/list_deployments.html
+++ b/app/templates/admin/list_deployments.html
@@ -13,6 +13,10 @@
   <div class="panel panel-info" id="deployments">
   <div class="panel-heading">Deployments</div>
   <div class="panel-body"><p>
+  <button class="btn btn-primary btn-md" onclick="window.open('{{ url_for('admin.list_addresses') }}','_self')"><span class="glyphicon glyphicon-book" aria-hidden="true"></span> Addresses</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-primary btn-md" onclick="window.open('{{ url_for('admin.list_archive') }}','_self')"><span class="glyphicon glyphicon-book" aria-hidden="true"></span> Archive</button> 
+
   <div class="no-more-tables">
   <table class="table table-hover table-striped table-condensed cf">
    <thead>
diff --git a/app/templates/admin/list_servers.html b/app/templates/admin/list_servers.html
index 5040560..710ba16 100644
--- a/app/templates/admin/list_servers.html
+++ b/app/templates/admin/list_servers.html
@@ -7,10 +7,10 @@
 
     <div class="col-md-12">
     <div class="panel panel-info">
-      <div class="panel-heading">Servers</div>
-      <div class="panel-body">
+    <div class="panel-heading">Servers</div>
+    <div class="panel-body">
 
-        <div class="table-responsive">
+    <div class="table-responsive">
           <table class="table table-hover table-striped table-condensed cf">
           <thead>
             <tr>
@@ -42,6 +42,9 @@
 
         </div>
       </div>
+      </div>
+      </div>
+
 
 
   </div>