diff --git a/app/templates/index.html b/app/templates/index.html
index 0536cc5..a8aa44a 100644
--- a/app/templates/index.html
+++ b/app/templates/index.html
@@ -142,7 +142,12 @@ input:checked + .slider:before {
                     
                         <li class="list-group-item">
                           <div class="row">
-                          <div class="col-md-8">{{outlet[1].name}}<br><span class="badge badge-secondary">Outlet: {{outlet[0]}}</span></a></div>
+                          <div class="col-md-8">{{outlet[1].name}}<br><span class="badge badge-secondary">Outlet: {{outlet[0]}}</span>                            
+                            {% if outlet[1].state == "on" %}
+                            <span class="badge badge-success">On</span>
+                            {% else %}
+                            <span class="badge badge-danger">Off</span>
+                            {% endif %}</div>
                           <div class="col-md-2">
                           <label class="switch">
                            {% if outlet[1].state == "on" %}
@@ -154,11 +159,7 @@ input:checked + .slider:before {
                           </label>
                           </div>
                           <div class="col-md-2">
-                            {% if outlet[1].state == "on" %}
-                            <span class="badge badge-success">On</span>
-                            {% else %}
-                            <span class="badge badge-danger">Off</span>
-                            {% endif %}
+
                           </div>
                         </div>
                         </li>