diff --git a/django-openstack/src/django_openstack/syspanel/views/services.py b/django-openstack/src/django_openstack/syspanel/views/services.py
index 75b2e8387..070256680 100644
--- a/django-openstack/src/django_openstack/syspanel/views/services.py
+++ b/django-openstack/src/django_openstack/syspanel/views/services.py
@@ -21,10 +21,8 @@ from django_openstack import forms
 from django_openstack.dash.views import instances as dash_instances
 from openstackx.api import exceptions as api_exceptions
 
-LOG = logging.getLogger('django_openstack.nova')
 
-
-class ServiceToggleEnabledForm(forms.SelfHandlingForm):
+class ToggleService(forms.SelfHandlingForm):
     service = forms.CharField(required=False)
     name = forms.CharField(required=False)
 
@@ -34,13 +32,13 @@ class ServiceToggleEnabledForm(forms.SelfHandlingForm):
             api.admin_api(request).services.update(data['service'], 
                                                    not service.disabled)
             if service.disabled:
-                messages.info(request, "Service '%s' has been enabled" \
+                messages.info(request, "Service '%s' has been enabled"
                                         % data['name'])
             else:
-                messages.info(request, "Service '%s' has been disabled" \
+                messages.info(request, "Service '%s' has been disabled"
                                         % data['name'])
         except api_exceptions.ApiException, e:
-            messages.error(request, "Unable to update service '%s': %s" \
+            messages.error(request, "Unable to update service '%s': %s"
                                      % data['name'], e.message)
         
         return redirect(request.build_absolute_uri())
@@ -48,7 +46,7 @@ class ServiceToggleEnabledForm(forms.SelfHandlingForm):
 
 @login_required
 def index(request):
-    for f in (ServiceToggleEnabledForm,):
+    for f in (ToggleService,):
         _, handled = f.maybe_handle(request)
         if handled:
             return handled
@@ -69,12 +67,12 @@ def index(request):
         except:
             up = False
         hostname = urlparse.urlparse(v['internalURL']).hostname
-        row = { 'type': k, 'internalURL': v['internalURL'], 'host': hostname,
-                'region': v['region'], 'up': up }
+        row = {'type': k, 'internalURL': v['internalURL'], 'host': hostname,
+               'region': v['region'], 'up': up }
         other_services.append(row)
    
     return render_to_response('syspanel_services.html', {
         'services': services,
-        'service_toggle_enabled_form': ServiceToggleEnabledForm,
+        'service_toggle_enabled_form': ToggleService,
         'other_services': other_services,
     }, context_instance = template.RequestContext(request))
diff --git a/openstack-dashboard/dashboard/templates/_syspanel_service_list.html b/openstack-dashboard/dashboard/templates/_syspanel_service_list.html
index 95c5f15ce..26e2d361e 100644
--- a/openstack-dashboard/dashboard/templates/_syspanel_service_list.html
+++ b/openstack-dashboard/dashboard/templates/_syspanel_service_list.html
@@ -8,17 +8,11 @@
   </tr>
 
   {% for service in services %}
-    <tr class="{% if service.up %}good{% endif %} {% if service.disabled %}medium{% endif %}{% if not service.up %}bad{% endif %} {% cycle 'odd' 'even' %}">
-      <td> {{service.host}} </td>
-      <td> {{service.type}} </td>
-      <td>
-      {% if service.disabled %}
-          Disabled
-      {% else %}
-          Enabled
-      {% endif %}
-      </td>
-      <td> {{service.up}} </td>
+    <tr class='{{service.up|yesno:"good,bad"}} {{service.disabled|yesno:"medium,"}} {% cycle 'odd' 'even' %}'>
+      <td>{{service.host}}</td>
+      <td>{{service.type}}</td>
+      <td>{{service.disabled|yesno:"Enabled,Disabled"}}</td>
+      <td>{{service.up}}</td>
       <td id="actions">
         <ul>
           <li>{% include "_service_toggle_enabled.html" with form=service_toggle_enabled_form %}</li>
@@ -27,12 +21,12 @@
     </tr>
   {% endfor %}
   {% for service in other_services %}
-    <tr class="{% if service.up %}good{% endif %} {% if service.disabled %}medium{% endif %}{% if not service.up %}bad{% endif %} {% cycle 'odd' 'even' %}">
-      <td> {{service.host}} </td>
-      <td> {{service.type}} </td>
-      <td> Enabled </td>
-      <td> {{service.up}} </td>
-      <td> </td>
+    <tr class='{{service.up|yesno:"good,bad"}} {{service.disabled|yesno:"medium,"}} {% cycle 'odd' 'even' %}'>
+      <td>{{service.host}}</td>
+      <td>{{service.type}}</td>
+      <td>{{service.disabled|yesno:"Enabled,Disabled"}}</td>
+      <td>{{service.up}}</td>
+      <td></td>
     </tr>
   {% endfor %}
 </table>
diff --git a/openstack-dashboard/dashboard/templates/syspanel_services.html b/openstack-dashboard/dashboard/templates/syspanel_services.html
index b80f42fb1..a720c939b 100644
--- a/openstack-dashboard/dashboard/templates/syspanel_services.html
+++ b/openstack-dashboard/dashboard/templates/syspanel_services.html
@@ -11,7 +11,7 @@
 {% block main %}
     <div id='page_header'>
       <h2><span>System Panel:</span> Services</h2>
-      <p class='desc'><span>&mdash;</span> Create, Edit, Upload, and Delete Services.</p>
+      <p class='desc'><span>&mdash;</span>View Service statuses, and toggle them to enabled or disabled.</p>
     </div>
     {% include "_messages.html" %}
     <div class="main_content">