diff --git a/app/templates/admin/admin_tasks.html b/app/templates/admin/admin_tasks.html
index 7213dfc..3c48381 100644
--- a/app/templates/admin/admin_tasks.html
+++ b/app/templates/admin/admin_tasks.html
@@ -3,13 +3,13 @@
   <div class="panel-heading">Admin Pages</div>                            
   <div class="panel-body">
     <center>
-    <button class="btn btn-success btn-lg" onclick="window.open('{{ url_for('admin.list_deployments') }}','_self')"><span class="glyphicon glyphicon-hdd" aria-hidden="true"></span> Deployments</button>
-    <button class="btn btn-success btn-lg" 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-lg" 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-lg" onclick="window.open('{{ url_for('admin.list_domains') }}','_self')"><span class="glyphicon glyphicon-home" aria-hidden="true"></span> Domains</button>
-    <button class="btn btn-danger btn-lg" onclick="window.open('{{ url_for('admin.list_cancelled') }}', '_self')"><span class="glyphicon glyphicon-cd" aria-hidden="true"></span> Recycle Bin</button>
-    <button class="btn btn-primary btn-lg" 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-lg" onclick="window.open('{{ url_for('admin.list_transactions') }}','_self')"><span class="glyphicon glyphicon-usd" aria-hidden="true"></span> Transactions</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> Deployments</button>
+    <button class="btn btn-success 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-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-danger btn-md" onclick="window.open('{{ url_for('admin.list_cancelled') }}', '_self')"><span class="glyphicon glyphicon-cd" aria-hidden="true"></span> Recycle Bin</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-usd" aria-hidden="true"></span> Transactions</button>
     </center>
   </div>
   </div>
diff --git a/app/templates/admin/list_deployments.html b/app/templates/admin/list_deployments.html
index 74b7869..e76db00 100644
--- a/app/templates/admin/list_deployments.html
+++ b/app/templates/admin/list_deployments.html
@@ -17,7 +17,6 @@
    <thead>
     <tr>
      <th>Owner</th>
-     <th>Cube ID</th>
      <th>Alias</th>
      <th>CPU</th>
      <th>Mem</th>
@@ -39,8 +38,7 @@
      {% endif %}
      {% endif %}
      <td><a href="{{ url_for('admin.dashboard', user_pid=deploy.user_id) }}">{{ deploy.owner.email }}</a></td>
-     <td>{{ deploy.machine_id }}</td>
-     <td>{{ deploy.machine_alias }}</font></td>
+     <td><a class="rrd" data-toggle="tooltip" title="Protected: {{ deploy.protected }}<br />Online: {{ deploy.connected }}<br />ID: {{ deploy.machine_id }}"><b>{% if deploy.protected == True %}<font color="green">{% else %}<font color="red">{% endif %}{{ deploy.machine_alias }}</font></b></a></td>
      <td>{{ deploy.machine_cpu }}</td>
      <td>{{ deploy.machine_mem }} MB</td>
      <td>{{ deploy.machine_hdd }} GB</td>