diff --git a/savannadashboard/cluster_templates/panel.py b/savannadashboard/cluster_templates/panel.py
index 1623ab92..8af33525 100644
--- a/savannadashboard/cluster_templates/panel.py
+++ b/savannadashboard/cluster_templates/panel.py
@@ -23,7 +23,7 @@ from savannadashboard import dashboard
 
 
 class ClusterTemplatesPanel(horizon.Panel):
-    name = _("Cluster templates")
+    name = _("Cluster Templates")
     slug = 'cluster_templates'
 
 
diff --git a/savannadashboard/clusters/tables.py b/savannadashboard/clusters/tables.py
index 3b8853fa..83856878 100644
--- a/savannadashboard/clusters/tables.py
+++ b/savannadashboard/clusters/tables.py
@@ -26,9 +26,8 @@ LOG = logging.getLogger(__name__)
 
 class ClustersTable(tables.DataTable):
     name = tables.Column("name",
-                         verbose_name=_("Cluster name"),
-                         link=("horizon:savannadashboard:clusters:"
-                               "cluster_details"))
+                         verbose_name=_("Cluster Name"),
+                         link=("horizon:savanna:clusters:details"))
 
     class Meta:
         name = "clusters"
diff --git a/savannadashboard/clusters/urls.py b/savannadashboard/clusters/urls.py
index 38df47c7..27bfadfa 100644
--- a/savannadashboard/clusters/urls.py
+++ b/savannadashboard/clusters/urls.py
@@ -24,5 +24,5 @@ urlpatterns = patterns('',
                        url(r'^$', ClustersView.as_view(),
                            name='index'),
                        url(r'^$', ClustersView.as_view(),
-                           name='nodegroup-templates'),
+                           name='clusters'),
                        )
diff --git a/savannadashboard/image_registry/tables.py b/savannadashboard/image_registry/tables.py
index aa1a6fb4..4bc373b5 100644
--- a/savannadashboard/image_registry/tables.py
+++ b/savannadashboard/image_registry/tables.py
@@ -29,7 +29,7 @@ LOG = logging.getLogger(__name__)
 
 class EditTagsAction(tables.LinkAction):
     name = "edit_tags"
-    verbose_name = _("Edit tags")
+    verbose_name = _("Edit Tags")
     url = "horizon:savanna:image_registry:edit_tags"
     classes = ("ajax-modal", "btn-create")
 
@@ -74,13 +74,13 @@ class RemoveImage(tables.DeleteAction):
 
 class ImageRegistryTable(tables.DataTable):
     name = tables.Column("name",
-                         verbose_name=_("Image name"))
+                         verbose_name=_("Image Name"))
     tags = tables.Column(tags_to_string,
                          verbose_name=_("Tags"))
 
     class Meta:
         name = "image_registry"
-        verbose_name = _("Image registry")
+        verbose_name = _("Image Registry")
         table_actions = ()
         table_actions = (RegisterImage, RemoveImages,)
         row_actions = (EditTagsAction, RemoveImage,)
diff --git a/savannadashboard/nodegroup_templates/panel.py b/savannadashboard/nodegroup_templates/panel.py
index 44a98850..65dba9ea 100644
--- a/savannadashboard/nodegroup_templates/panel.py
+++ b/savannadashboard/nodegroup_templates/panel.py
@@ -23,7 +23,7 @@ from savannadashboard import dashboard
 
 
 class NodegroupTemplatesPanel(horizon.Panel):
-    name = _("Node group templates")
+    name = _("Node Group Templates")
     slug = 'nodegroup_templates'
 
 
diff --git a/savannadashboard/nodegroup_templates/tables.py b/savannadashboard/nodegroup_templates/tables.py
index 0a0d8dda..453bf11b 100644
--- a/savannadashboard/nodegroup_templates/tables.py
+++ b/savannadashboard/nodegroup_templates/tables.py
@@ -28,14 +28,14 @@ LOG = logging.getLogger(__name__)
 
 class CreateNodegroupTemplate(tables.LinkAction):
     name = "create"
-    verbose_name = _("Create Node group Template")
+    verbose_name = _("Create Node Group Template")
     url = "horizon:savanna:nodegroup_templates:create-nodegroup-template"
     classes = ("ajax-modal", "btn-create", "create-nodegrouptemplate-btn")
 
 
 class ConfigureNodegroupTemplate(tables.LinkAction):
     name = "configure"
-    verbose_name = _("Configure Node group Template")
+    verbose_name = _("Configure Node Group Template")
     url = "horizon:savanna:nodegroup_templates:configure-nodegroup-template"
     classes = ("ajax-modal", "btn-create", "configure-nodegrouptemplate-btn")
 
@@ -47,8 +47,8 @@ class DeleteTemplate(tables.BatchAction):
 
     action_present = _("Delete")
     action_past = _("Deleted")
-    data_type_singular = _("Node group Template")
-    data_type_plural = _("Node group Templates")
+    data_type_singular = _("Node Group Template")
+    data_type_plural = _("Node Group Templates")
 
     def allowed(self, request, template):
         return True
@@ -66,18 +66,18 @@ def render_processes(nodegroup_template):
 
 class NodegroupTemplatesTable(tables.DataTable):
     name = tables.Column("name",
-                         verbose_name=_("Node group template name"),
+                         verbose_name=_("Node Group Template Name"),
                          link=("horizon:savanna:nodegroup_templates:details"))
     plugin_name = tables.Column("plugin_name",
-                                verbose_name=_("Plugin name"))
+                                verbose_name=_("Plugin Name"))
     hadoop_version = tables.Column("hadoop_version",
-                                   verbose_name=_("Hadoop version"))
+                                   verbose_name=_("Hadoop Version"))
     node_processes = tables.Column(render_processes,
-                                   verbose_name=_("Node processes"))
+                                   verbose_name=_("Node Processes"))
 
     class Meta:
         name = "nodegroup_templates"
-        verbose_name = _("Node group Templates")
+        verbose_name = _("Node Group Templates")
         table_actions = (CreateNodegroupTemplate,
                          ConfigureNodegroupTemplate,
                          DeleteTemplate)
diff --git a/savannadashboard/nodegroup_templates/tabs.py b/savannadashboard/nodegroup_templates/tabs.py
index 1ebadb1c..c8fe81d6 100644
--- a/savannadashboard/nodegroup_templates/tabs.py
+++ b/savannadashboard/nodegroup_templates/tabs.py
@@ -27,7 +27,7 @@ LOG = logging.getLogger(__name__)
 
 
 class GeneralTab(tabs.Tab):
-    name = _("General info")
+    name = _("General Info")
     slug = "nodegroup_template_details_tab"
     template_name = ("nodegroup_templates/_details.html")
 
@@ -40,7 +40,7 @@ class GeneralTab(tabs.Tab):
 
 
 class ConfigsTab(tabs.Tab):
-    name = _("Service configurations")
+    name = _("Service Configurations")
     slug = "nodegroup_template_service_configs_tab"
     template_name = ("nodegroup_templates/_service_confs.html")
 
diff --git a/savannadashboard/nodegroup_templates/workflows.py b/savannadashboard/nodegroup_templates/workflows.py
index 26b696aa..c981be8b 100644
--- a/savannadashboard/nodegroup_templates/workflows.py
+++ b/savannadashboard/nodegroup_templates/workflows.py
@@ -100,7 +100,7 @@ class GeneralConfigAction(workflows.Action):
         return super(GeneralConfigAction, self).get_help_text(extra)
 
     class Meta:
-        name = _("Configure Node group Template")
+        name = _("Configure Node Group Template")
         help_text_template = \
             ("nodegroup_templates/_configure_general_help.html")
 
@@ -118,7 +118,7 @@ class GeneralConfig(workflows.Step):
 
 class ConfigureNodegroupTemplate(workflows.Workflow):
     slug = "configure_nodegroup_template"
-    name = _("Create Node group Template")
+    name = _("Create Node Group Template")
     finalize_button_name = _("Create")
     success_message = _("Created")
     failure_message = _("Could not create")
@@ -222,7 +222,7 @@ class SelectPluginAction(workflows.Action):
         plugin_choices = [(plugin.name, plugin.title) for plugin in plugins]
 
         self.fields["plugin_name"] = forms.ChoiceField(
-            label=_("Plugin name"),
+            label=_("Plugin Name"),
             required=True,
             choices=plugin_choices,
             widget=forms.Select(attrs={"class": "plugin_name_choice"}))
@@ -230,7 +230,7 @@ class SelectPluginAction(workflows.Action):
         for plugin in plugins:
             field_name = plugin.name + "_version"
             choice_field = forms.ChoiceField(
-                label=_("Hadoop version"),
+                label=_("Hadoop Version"),
                 required=True,
                 choices=[(version, version) for version in plugin.versions],
                 widget=forms.Select(
@@ -258,7 +258,7 @@ class SelectPlugin(workflows.Step):
 
 class CreateNodegroupTemplate(workflows.Workflow):
     slug = "create_nodegroup_template"
-    name = _("Create Node group Template")
+    name = _("Create Node Group Template")
     finalize_button_name = _("Create")
     success_message = _("Created")
     failure_message = _("Could not create")
diff --git a/savannadashboard/plugins/tables.py b/savannadashboard/plugins/tables.py
index 773e60be..1650bb78 100644
--- a/savannadashboard/plugins/tables.py
+++ b/savannadashboard/plugins/tables.py
@@ -33,14 +33,14 @@ def render_versions(plugin):
 
 class PluginsTable(tables.DataTable):
     title = tables.Column("title",
-                          verbose_name=_("Plugin name"),
+                          verbose_name=_("Plugin Name"),
                           link=("horizon:savanna:plugins:details"))
 
     versions = tables.Column(render_versions,
-                             verbose_name=_("Supported hadoop versions"))
+                             verbose_name=_("Supported Hadoop Versions"))
 
     description = tables.Column("description",
-                                verbose_name=_("Plugin description"))
+                                verbose_name=_("Plugin Description"))
 
     class Meta:
         name = "plugins"
diff --git a/savannadashboard/templates/cluster_templates/_details.html b/savannadashboard/templates/cluster_templates/_details.html
index 1fb9ace3..911de20a 100644
--- a/savannadashboard/templates/cluster_templates/_details.html
+++ b/savannadashboard/templates/cluster_templates/_details.html
@@ -12,7 +12,7 @@
     <dl>
         <dt>{% trans "Plugin" %}</dt>
         <dd><a href="/savanna/plugins/{{ template.plugin_name }}">{{ template.plugin_name }}</a></dd>
-        <dt>{% trans "Hadoop version" %}</dt>
+        <dt>{% trans "Hadoop Version" %}</dt>
         <dd>{{ template.hadoop_version }}</dd>
     </dl>
     <dl>
diff --git a/savannadashboard/templates/cluster_templates/cluster_templates.html b/savannadashboard/templates/cluster_templates/cluster_templates.html
index 85397249..c4b90ddf 100644
--- a/savannadashboard/templates/cluster_templates/cluster_templates.html
+++ b/savannadashboard/templates/cluster_templates/cluster_templates.html
@@ -3,7 +3,7 @@
 {% block title %}{% trans "Savanna" %}{% endblock %}
 
 {% block page_header %}
-  {% include "horizon/common/_page_header.html" with title=_("Savanna - Cluster Templates") %}
+    {% include "horizon/common/_page_header.html" with title=_("Savanna - Cluster Templates") %}
 {% endblock page_header %}
 
 {% block main %}
diff --git a/savannadashboard/templates/cluster_templates/details.html b/savannadashboard/templates/cluster_templates/details.html
index 3d1efe83..8cba7464 100644
--- a/savannadashboard/templates/cluster_templates/details.html
+++ b/savannadashboard/templates/cluster_templates/details.html
@@ -3,7 +3,7 @@
 {% block title %}{% trans "Cluster Template Details" %}{% endblock %}
 
 {% block page_header %}
-    {% include "horizon/common/_page_header.html" with title="Savanna Cluster Template Details: "%}
+    {% include "horizon/common/_page_header.html" with title=_("Savanna - Cluster Template Details") %}
 {% endblock page_header %}
 
 {% block main %}
diff --git a/savannadashboard/templates/clusters/clusters.html b/savannadashboard/templates/clusters/clusters.html
index ad3bd4d0..51679d46 100644
--- a/savannadashboard/templates/clusters/clusters.html
+++ b/savannadashboard/templates/clusters/clusters.html
@@ -3,7 +3,7 @@
 {% block title %}{% trans "Savanna" %}{% endblock %}
 
 {% block page_header %}
-  {% include "horizon/common/_page_header.html" with title=_("Savanna - Clusters") %}
+    {% include "horizon/common/_page_header.html" with title=_("Savanna - Clusters") %}
 {% endblock page_header %}
 
 {% block main %}
diff --git a/savannadashboard/templates/image_registry/_tag_form.html b/savannadashboard/templates/image_registry/_tag_form.html
index cce0ae81..82d19752 100644
--- a/savannadashboard/templates/image_registry/_tag_form.html
+++ b/savannadashboard/templates/image_registry/_tag_form.html
@@ -28,7 +28,7 @@
     }
 
     function update_image_tags() {
-        var tags = []
+        var tags = [];
         $("#image_tags_list span").each(function (el) {
             tags.push($.trim($(this).text()));
         });
@@ -36,8 +36,8 @@
     }
 
     function remove_tag(icon) {
-        span = icon.parentNode
-        span.parentNode.removeChild(span)
+        span = icon.parentNode;
+        span.parentNode.removeChild(span);
         update_image_tags()
     }
 </script>
diff --git a/savannadashboard/templates/image_registry/edit_tags.html b/savannadashboard/templates/image_registry/edit_tags.html
index 3cab079c..3b096c26 100644
--- a/savannadashboard/templates/image_registry/edit_tags.html
+++ b/savannadashboard/templates/image_registry/edit_tags.html
@@ -3,9 +3,9 @@
 {% block title %}{% trans "Edit Image Tags" %}{% endblock %}
 
 {% block page_header %}
-  {% include "horizon/common/_page_header.html" with title=_("Edit Image Tags") %}
+    {% include "horizon/common/_page_header.html" with title=_("Edit Image Tags") %}
 {% endblock page_header %}
 
 {% block main %}
-  {% include 'templates/image_registry/_edit_tags.html' %}
+    {% include 'templates/image_registry/_edit_tags.html' %}
 {% endblock %}
\ No newline at end of file
diff --git a/savannadashboard/templates/image_registry/image_registry.html b/savannadashboard/templates/image_registry/image_registry.html
index 20240cd3..fb309774 100644
--- a/savannadashboard/templates/image_registry/image_registry.html
+++ b/savannadashboard/templates/image_registry/image_registry.html
@@ -3,7 +3,7 @@
 {% block title %}{% trans "Savanna" %}{% endblock %}
 
 {% block page_header %}
-  {% include "horizon/common/_page_header.html" with title=_("Savanna - Image Registry") %}
+    {% include "horizon/common/_page_header.html" with title=_("Savanna - Image Registry") %}
 {% endblock page_header %}
 
 {% block main %}
diff --git a/savannadashboard/templates/image_registry/register_image.html b/savannadashboard/templates/image_registry/register_image.html
index 89992ac5..dfca2b6c 100644
--- a/savannadashboard/templates/image_registry/register_image.html
+++ b/savannadashboard/templates/image_registry/register_image.html
@@ -3,9 +3,9 @@
 {% block title %}{% trans "Register Image" %}{% endblock %}
 
 {% block page_header %}
-  {% include "horizon/common/_page_header.html" with title=_("Register Image") %}
+    {% include "horizon/common/_page_header.html" with title=_("Register Image") %}
 {% endblock page_header %}
 
 {% block main %}
-  {% include 'templates/image_registry/_register_image.html' %}
+    {% include 'templates/image_registry/_register_image.html' %}
 {% endblock %}
\ No newline at end of file
diff --git a/savannadashboard/templates/nodegroup_templates/_details.html b/savannadashboard/templates/nodegroup_templates/_details.html
index a1c1bf40..849079c4 100644
--- a/savannadashboard/templates/nodegroup_templates/_details.html
+++ b/savannadashboard/templates/nodegroup_templates/_details.html
@@ -16,11 +16,11 @@
     <dl>
         <dt>{% trans "Plugin" %}</dt>
         <dd><a href="/savanna/plugins/{{ template.plugin_name }}">{{ template.plugin_name }}</a></dd>
-        <dt>{% trans "Hadoop version" %}</dt>
+        <dt>{% trans "Hadoop Version" %}</dt>
         <dd>{{ template.hadoop_version }}</dd>
     </dl>
     <dl>
-        <dt>{% trans "Node processes" %}</dt>
+        <dt>{% trans "Node Processes" %}</dt>
         <dd>
             <ul>
                 {% for process in template.node_processes %}
diff --git a/savannadashboard/templates/nodegroup_templates/_service_confs.html b/savannadashboard/templates/nodegroup_templates/_service_confs.html
index 4d3fa57f..e643919f 100644
--- a/savannadashboard/templates/nodegroup_templates/_service_confs.html
+++ b/savannadashboard/templates/nodegroup_templates/_service_confs.html
@@ -1,5 +1,5 @@
 {% load i18n sizeformat %}
-<h3>{% trans "Service configurations" %}</h3>
+<h3>{% trans "Service Configurations" %}</h3>
 <div class="status row-fluid detail">
     <dl>
         {% for service, config in template.node_configs.items %}
diff --git a/savannadashboard/templates/nodegroup_templates/configure.html b/savannadashboard/templates/nodegroup_templates/configure.html
index 42ebdb6d..2e1fd928 100644
--- a/savannadashboard/templates/nodegroup_templates/configure.html
+++ b/savannadashboard/templates/nodegroup_templates/configure.html
@@ -1,9 +1,9 @@
 {% extends 'base.html' %}
 {% load i18n %}
-{% block title %}{% trans "Create Node group Template" %}{% endblock %}
+{% block title %}{% trans "Create Node Group Template" %}{% endblock %}
 
 {% block page_header %}
-    {% include "horizon/common/_page_header.html" with title=_("Savanna - Create Node group Template") %}
+    {% include "horizon/common/_page_header.html" with title=_("Savanna - Create Node Group Template") %}
 {% endblock page_header %}
 
 {% block main %}
diff --git a/savannadashboard/templates/nodegroup_templates/create.html b/savannadashboard/templates/nodegroup_templates/create.html
index 42ebdb6d..2e1fd928 100644
--- a/savannadashboard/templates/nodegroup_templates/create.html
+++ b/savannadashboard/templates/nodegroup_templates/create.html
@@ -1,9 +1,9 @@
 {% extends 'base.html' %}
 {% load i18n %}
-{% block title %}{% trans "Create Node group Template" %}{% endblock %}
+{% block title %}{% trans "Create Node Group Template" %}{% endblock %}
 
 {% block page_header %}
-    {% include "horizon/common/_page_header.html" with title=_("Savanna - Create Node group Template") %}
+    {% include "horizon/common/_page_header.html" with title=_("Savanna - Create Node Group Template") %}
 {% endblock page_header %}
 
 {% block main %}
diff --git a/savannadashboard/templates/nodegroup_templates/details.html b/savannadashboard/templates/nodegroup_templates/details.html
index 5363412d..633752f3 100644
--- a/savannadashboard/templates/nodegroup_templates/details.html
+++ b/savannadashboard/templates/nodegroup_templates/details.html
@@ -3,13 +3,13 @@
 {% block title %}{% trans "Nodegroup Template Details" %}{% endblock %}
 
 {% block page_header %}
-    {% include "horizon/common/_page_header.html" with title="Savanna node group template details: "%}
+    {% include "horizon/common/_page_header.html" with title=_("Savanna node group template details") %}
 {% endblock page_header %}
 
 {% block main %}
     <div class="row-fluid">
         <div class="span12">
-        {{ tab_group.render }}
+            {{ tab_group.render }}
         </div>
     </div>
 {% endblock %}
\ No newline at end of file
diff --git a/savannadashboard/templates/nodegroup_templates/nodegroup_templates.html b/savannadashboard/templates/nodegroup_templates/nodegroup_templates.html
index 10e19621..8cd0dd42 100644
--- a/savannadashboard/templates/nodegroup_templates/nodegroup_templates.html
+++ b/savannadashboard/templates/nodegroup_templates/nodegroup_templates.html
@@ -3,7 +3,7 @@
 {% block title %}{% trans "Savanna" %}{% endblock %}
 
 {% block page_header %}
-{% include "horizon/common/_page_header.html" with title=_("Savanna - Node group Templates") %}
+    {% include "horizon/common/_page_header.html" with title=_("Savanna - Node Group Templates") %}
 {% endblock page_header %}
 
 {% block main %}
diff --git a/savannadashboard/templates/plugins/details.html b/savannadashboard/templates/plugins/details.html
index e03bc4fe..a06fe908 100644
--- a/savannadashboard/templates/plugins/details.html
+++ b/savannadashboard/templates/plugins/details.html
@@ -3,13 +3,13 @@
 {% block title %}{% trans "Plugin Detail" %}{% endblock %}
 
 {% block page_header %}
-  {% include "horizon/common/_page_header.html" with title="Savanna plugin details: "%}
+    {% include "horizon/common/_page_header.html" with title=_("Savanna Plugin Details") %}
 {% endblock page_header %}
 
 {% block main %}
 <div class="row-fluid">
-  <div class="span12">
-  {{ tab_group.render }}
-  </div>
+    <div class="span12">
+        {{ tab_group.render }}
+    </div>
 </div>
 {% endblock %}
\ No newline at end of file
diff --git a/savannadashboard/templates/plugins/plugins.html b/savannadashboard/templates/plugins/plugins.html
index 3bfac0a8..9c67b184 100644
--- a/savannadashboard/templates/plugins/plugins.html
+++ b/savannadashboard/templates/plugins/plugins.html
@@ -3,7 +3,7 @@
 {% block title %}{% trans "Savanna" %}{% endblock %}
 
 {% block page_header %}
-  {% include "horizon/common/_page_header.html" with title=_("Savanna - Plugins") %}
+    {% include "horizon/common/_page_header.html" with title=_("Savanna - Plugins") %}
 {% endblock page_header %}
 
 {% block main %}