diff --git a/app/templates/admin/list_addresses.html b/app/templates/admin/list_addresses.html
index 526f0ce..3571fe0 100644
--- a/app/templates/admin/list_addresses.html
+++ b/app/templates/admin/list_addresses.html
@@ -13,6 +13,7 @@
   <div class="panel panel-info" id="addresses">
   <div class="panel-heading">Addresses</div>
   <div class="panel-body"><p>
+  <div class="no-more-tables">
   <table class="table table-hover table-striped table-condensed cf">
    <thead>
     <tr>
@@ -22,7 +23,6 @@
      <th>Server</th>
      <th>VLAN</th>
      <th>Deploy</th>
-     <th>Server</th>
      <th>rDNS</th>
     </tr>
     </thead>
@@ -30,17 +30,17 @@
     {% for address in addresses %}
     <tr>
      {% if address.reserved == True %}<tr class="danger">{% else %}<tr>{% endif %}
-     <!--<td>region1</td>-->
-     <td>{{ address.ip }}</td>
+     <!--<td data-title="Region">region1</td>-->
+     <td data-title="IP">{{ address.ip }}</td>
      {% if address.user_id != None %}
-     <td><a href="{{ url_for('admin.dashboard', user_pid=address.user_id) }}">{{ address.owner.email }}</a></td>
+     <td data-title="Assignee"><a href="{{ url_for('admin.dashboard', user_pid=address.user_id) }}">{{ address.owner.email }}</a></td>
      {% else %}
      <td></td>
      {% endif %}
      {% if address.assignee != None %}
-     <td>{{ address.assignee.deploy.server.name }}</td>
-     <td>{{ address.assignee.vlan_id }}</td>
-     <td>{{ address.assignee.deploy.machine_alias }}</td>
+     <td data-title="Server">{{ address.assignee.deploy.server.name }}</td>
+     <td data-title="VLAN">{{ address.assignee.vlan_id }}</td>
+     <td data-title="Deploy">{{ address.assignee.deploy.machine_alias }}</td>
 {% else %}
 <td></td>
      <td></td>
@@ -48,7 +48,7 @@
      {% endif %}
 
      {% if address.rdns != None %}
-     <td>{{ address.rdns }}</td>
+     <td data-title="rDNS">{{ address.rdns }}</td>
      {% else %}
      <td></td>
      {% endif %}
diff --git a/app/templates/admin/list_deployments.html b/app/templates/admin/list_deployments.html
index b240084..de59908 100644
--- a/app/templates/admin/list_deployments.html
+++ b/app/templates/admin/list_deployments.html
@@ -13,6 +13,7 @@
   <div class="panel panel-info" id="deployments">
   <div class="panel-heading">Deployments</div>
   <div class="panel-body"><p>
+  <div class="no-more-tables">
   <table class="table table-hover table-striped table-condensed cf">
    <thead>
     <tr>
@@ -36,17 +37,17 @@
      <tr>
      {% endif %}
      {% endif %}
-     <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>
+     <td data-title="Alias"><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 data-title="CPU">{{ deploy.machine_cpu }}</td>
+     <td data-title="Memory">{{ deploy.machine_mem }} MB</td>
+     <td data-title="HDD">{{ deploy.machine_hdd }} GB</td>
      {% if deploy.date_last_charge == None %}
-     <td>Never</td>
+     <td data-title="Last Charged">Never</td>
      {% else %}
-     <td>{{ moment(deploy.date_last_charge).format('lll') }} ({{ moment(deploy.date_last_charge).fromNow() }})</td>
+     <td data-title="Last Charged">{{ moment(deploy.date_last_charge).format('lll') }} ({{ moment(deploy.date_last_charge).fromNow() }})</td>
      {% endif %}
-     <td>{{ deploy.daysleft }}</td>
-     <td><a href="{{ url_for('admin.dashboard', user_pid=deploy.user_id) }}">{{ deploy.owner.email }}</a></td>
+     <td data-title="Days Left">{{ deploy.daysleft }}</td>
+     <td data-title="Owner"><a href="{{ url_for('admin.dashboard', user_pid=deploy.user_id) }}">{{ deploy.owner.email }}</a></td>
     {% endfor %}
     </tbody>
    </table>
diff --git a/app/templates/admin/list_services.html b/app/templates/admin/list_services.html
index 92b4255..53f2617 100644
--- a/app/templates/admin/list_services.html
+++ b/app/templates/admin/list_services.html
@@ -13,6 +13,7 @@
   <div class="panel panel-info" id="services">
   <div class="panel-heading">Services</div>
   <div class="panel-body"><p>
+  <div class="no-more-tables">
   <table class="table table-hover table-striped table-condensed cf">
    <thead>
     <tr>
@@ -35,12 +36,12 @@
      <tr>
      {% endif %}
      {% endif %}
-     <td><a href="{{ url_for('admin.dashboard', user_pid=service.user_id) }}">{{ service.owner.email }}</a></td>
-     <td>{{ service.category }}</td>
-     <td>{{ service.description }}</td>
-     <td>{{ service.price }}</td>
-     <td>{{ moment(service.date_last_charge).format('ll') }} ({{ moment(service.date_last_charge).fromNow() }})</td>
-     <td>{{ service.daysleft }}</td>
+     <td data-title="Owner"><a href="{{ url_for('admin.dashboard', user_pid=service.user_id) }}">{{ service.owner.email }}</a></td>
+     <td data-title="Category">{{ service.category }}</td>
+     <td data-title="Description">{{ service.description }}</td>
+     <td data-title="Price">{{ service.price }}</td>
+     <td data-title="Last Charged">{{ moment(service.date_last_charge).format('ll') }} ({{ moment(service.date_last_charge).fromNow() }})</td>
+     <td data-title="Days Left">{{ service.daysleft }}</td>
     </tr>
     {% endfor %}
     </tbody>
diff --git a/app/templates/admin/list_transactions.html b/app/templates/admin/list_transactions.html
index ba16535..f6225c2 100644
--- a/app/templates/admin/list_transactions.html
+++ b/app/templates/admin/list_transactions.html
@@ -9,8 +9,7 @@
     <div class="panel panel-info">
       <div class="panel-heading">All Transactions</div>
       <div class="panel-body">
-
-        <div class="table-responsive">
+          <div class="no-more-tables"> 
           <table class="table table-hover table-striped table-condensed cf">
           <thead>
             <tr>
@@ -26,18 +25,18 @@
           {% for transaction in transactions %}
             {% if transaction.value > 0 %}
               <tr class="default">
-                <td>{{ transaction.pid }}</td>
-                <td>{{ transaction.description }}</td>
-                <td>{{ transaction.value }} {{ transaction.currency }}</td>
-                <td>{{ moment(transaction.date_created).format('lll') }}</td>
-                <td><a href="{{ url_for('admin.transaction', user_pid=transaction.owner.pid) }}">{{ transaction.owner.email }}</a></td>
+                <td data-title="ID">{{ transaction.pid }}</td>
+                <td data-title="Description">{{ transaction.description }}</td>
+                <td data-title="Amount">{{ transaction.value }} {{ transaction.currency }}</td>
+                <td data-title="Date">{{ moment(transaction.date_created).format('lll') }}</td>
+                <td data-title="User"><a href="{{ url_for('admin.transaction', user_pid=transaction.owner.pid) }}">{{ transaction.owner.email }}</a></td>
             {% else %}
               <tr class="default">
-                <td>{{ transaction.pid }}</td>
-                <td>{{ transaction.description }}</td>
-                <td>{{ transaction.value }} {{ transaction.currency }}</td>
-                <td>{{ moment(transaction.date_created).format('lll') }}</td>
-                <td><a href="{{ url_for('admin.transaction', user_pid=transaction.owner.pid) }}">{{ transaction.owner.email }}</a></td>
+                <td data-title="ID">{{ transaction.pid }}</td>
+                <td data-title="Description">{{ transaction.description }}</td>
+                <td data-title="Amount">{{ transaction.value }} {{ transaction.currency }}</td>
+                <td data-title="Date">{{ moment(transaction.date_created).format('lll') }}</td>
+                <td data-title="User"><a href="{{ url_for('admin.transaction', user_pid=transaction.owner.pid) }}">{{ transaction.owner.email }}</a></td>
             {% endif %}
               </tr>
            </tbody>
diff --git a/app/templates/admin/list_users.html b/app/templates/admin/list_users.html
index 86a87b1..0e7bad8 100644
--- a/app/templates/admin/list_users.html
+++ b/app/templates/admin/list_users.html
@@ -8,25 +8,26 @@
   <div class="panel panel-info" id="users">
   <div class="panel-heading">List Active Users</div>
   <div class="panel-body"><p>
+  <div class="no-more-tables">
   <table class="table table-hover table-striped table-condensed cf">
   <thead>
    <tr>
-    <td>id</td>
     <td>email</td>
     <td>last seen</td>
     <td>last ip</td>
     <td>wallet</td>
+    <td>currency</td>
     <td></td>
    </tr>
   </thead>
   <tbody>
   {% for usr in users %}
    <tr>
-    <td>{{ usr.pid }}</td>
-    <td><font {% if usr.is_administrator() == True %}color="red"{% endif %}>{{ usr.email }}</td>
-    <td>{{ moment(usr.last_seen).format('lll') }}</td>
-    <td><a href="https://apps.db.ripe.net/search/query.html?searchtext={{ usr.last_ip }}" data-toggle="tooltip" title="RIPE Whois Search" target="_blank">{{ usr.last_ip }}</a></td>
-    <td>{{ usr.wallet }}<td>
+    <td data-title="Email"><font {% if usr.is_administrator() == True %}color="red"{% endif %}>{{ usr.email }}</td>
+    <td data-title="Last Seen">{{ moment(usr.last_seen).format('lll') }}</td>
+    <td data-title="Last IP"><a href="https://apps.db.ripe.net/search/query.html?searchtext={{ usr.last_ip }}" data-toggle="tooltip" title="RIPE Whois Search" target="_blank">{{ usr.last_ip }}</a></td>
+    <td data-title="Wallet">{{ usr.wallet }}</td>
+    <td data-title="Currency">{{ usr.currency }}</td>
     <td><a href="{{ url_for('admin.charge', user_pid=usr.pid) }}" data-toggle="tooltip" title="Add Funds"><span class="glyphicon glyphicon-plus"></span></a>
     <a href="{{ url_for('admin.transaction', user_pid=usr.pid) }}" data-toggle="tooltip" title="List Transactions"><span class="glyphicon glyphicon-credit-card"></span></a>
     <a href="{{ url_for('admin.dashboard', user_pid=usr.pid) }}" data-toggle="tooltip" title="Show Dashboard"><span class="glyphicon glyphicon-modal-window"></span></a>
diff --git a/app/templates/panel/dashboard.html b/app/templates/panel/dashboard.html
index 9afeea9..2936cdd 100644
--- a/app/templates/panel/dashboard.html
+++ b/app/templates/panel/dashboard.html
@@ -2,62 +2,6 @@
 
 {% block styles %}
 {{ super() }}
-
-<style type="text/css">
-.tg  {border-collapse:collapse;border-spacing:0;}
-.tg td{font-family:Arial, sans-serif;font-size:14px;padding:1px 1px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;}
-.tg th{font-family:Arial, sans-serif;font-size:14px;padding:1px 1px;font-weight:normal;padding:border-style:solid;border-width:1px;overflow:hidden;word-break:normal;}
-.tg .tg-yw4l{vertical-align:top}
-
-@media only screen and (max-width: 768px) {
-        /* Force table to not be like tables anymore */
-        .no-more-tables table,
-        .no-more-tables thead,
-        .no-more-tables tbody,
-        .no-more-tables th,
-        .no-more-tables td,
-        .no-more-tables tr {
-        display: block;
-        }
-         
-        /* Hide table headers (but not display: none;, for accessibility) */
-        .no-more-tables thead tr {
-        position: absolute;
-        top: -9999px;
-        left: -9999px;
-        }
-         
-        .no-more-tables tr { border: 1px solid #ccc; }
-          
-        .no-more-tables td {
-        /* Behave like a "row" */
-        border: none;
-        border-bottom: 1px solid #eee;
-        position: relative;
-        padding-left: 50%;
-        white-space: normal;
-        text-align:left;
-        }
-         
-        .no-more-tables td:before {
-        /* Now like a table header */
-        /* position: absolute; */
-        /* Top/left values mimic padding */
-        top: 6px;
-        left: 6px;
-        width: 45%;
-        padding-right: 10px;
-        white-space: nowrap;
-        text-align: left;
-        font-weight: bold;
-        }
-         
-        /*
-        Label the data
-        */
-        .no-more-tables td:before { content: attr(data-title); }
-        }
-</style>
 {% endblock %}
 
 {% block scripts %}
@@ -144,6 +88,7 @@ addEventListener("DOMContentLoaded", function() {
   <div class="panel panel-info" id="services">
   <div class="panel-heading">Services</div>
   <div class="panel-body">
+  <div class="no-more-tables">
   {% include "panel/services.html" %}
   </div>
   </div>
diff --git a/app/templates/uinvoice/transactions.html b/app/templates/uinvoice/transactions.html
index 6278816..ded0d65 100644
--- a/app/templates/uinvoice/transactions.html
+++ b/app/templates/uinvoice/transactions.html
@@ -77,14 +77,14 @@ var myChart = new Chart(ctx, {
           {% for transaction in transactions %}
             {% if transaction.value < 0 %}
               <tr class="default">
-                <td>{{ moment(transaction.date_created).format('lll') }}</td>
-                <td>{{ transaction.description }}</td>
-                <td>{{ transaction.value|abs }} {{ transaction.currency }}</td>
+                <td data-title="Date">{{ moment(transaction.date_created).format('lll') }}</td>
+                <td data-title="Description">{{ transaction.description }}</td>
+                <td data-title="Amount">{{ transaction.value|abs }} {{ transaction.currency }}</td>
             {% else %}
               <tr class="default">
-                <td>{{ moment(transaction.date_created).format('lll') }}</td>
-                <td>{{ transaction.description }}</td>
-                <td>{{ transaction.value|abs }} {{ transaction.currency }}</td>
+                <td data-title="Date">{{ moment(transaction.date_created).format('lll') }}</td>
+                <td data-title="Description">{{ transaction.description }}</td>
+                <td data-title="Amount">{{ transaction.value|abs }} {{ transaction.currency }}</td>
             {% endif %}
               </tr>
            </tbody>