diff --git a/app/templates/main/dashboard.html b/app/templates/main/dashboard.html
index b84386b..1679ec3 100644
--- a/app/templates/main/dashboard.html
+++ b/app/templates/main/dashboard.html
@@ -138,7 +138,6 @@ addEventListener("DOMContentLoaded", function() {
       <th>HDD</th>
       <th>Network</th>
       <th>Control</th>
-      <th></th>
       <th>Time Left</th> 
      </tr>
     </thead>
@@ -215,8 +214,8 @@ addEventListener("DOMContentLoaded", function() {
      <td data-title="Category">{{ service.category }}</td>
      <td data-title="Description" >{{ service.description }}</td>
      <td data-title="Last Charged">{{ moment(service.date_last_charge).format('lll') }} ({{ moment(service.date_last_charge).fromNow() }})</td>
-    {% if service.warning == True %}
-    <td data-title="Time Left"><button class="btn btn-default btn-success" onclick="window.open('/smanager/activate/{{ service.pid }}');"><span class="glyphicon glyphicon-bell" aria-hidden="true"></span> Renew</button></td>
+    {% if service.warning == True % or service.enabled == True}
+    <td data-title="Time Left"><button class="btn btn-default btn-success" onclick="window.open('/smanager/activate/{{ service.pid }}');"><span class="glyphicon glyphicon-bell" aria-hidden="true"></span> Activate</button></td>
     {% else %}
     <td data-title="Time Left">{{ service.daysleft }} day(s)</td>
     {% endif %}
@@ -249,10 +248,14 @@ addEventListener("DOMContentLoaded", function() {
     <tr>
     <td data-title="Domain"><b><a href="http://{{ domain.fqdn }}">{{ domain.fqdn }}</a></b></td>
     <td data-title="Expiry Date">{{ domain.date_expire }}</td>
-    {% if domain.warning == True %}
-    <td data-title="Time Left"><button class="btn btn-default btn-success" onclick="window.open('/dmanager/activate/{{ domain.pid }}');"><span class="glyphicon glyphicon-bell" aria-hidden="true"></span> Renew</button></td>
+    {% if domain.enabled == True %}
+      {% if domain.warning == True %}
+      <td data-title="Time Left"><button class="btn btn-default btn-success" onclick="window.open('/dmanager/activate/{{ domain.pid }}');"><span class="glyphicon glyphicon-bell" aria-hidden="true"></span> Activate</button></td>
+      {% else %}
+      <td data-title="Time Left">{{ domain.daysleft }} day(s)</td>
+      {% endif %}
     {% else %}
-    <td data-title="Time Left">{{ domain.daysleft }} day(s)</td>
+    <td data-title="Time Left">EXPIRED</td>
     {% endif %}
 
     </tr>