diff --git a/ckan/templates/admin/config.html b/ckan/templates/admin/config.html
index bfa9b3a2ee5..81a322b3997 100644
--- a/ckan/templates/admin/config.html
+++ b/ckan/templates/admin/config.html
@@ -10,7 +10,7 @@
     <div class="form-actions">
       {% set locale = h.dump_json({'content': _('Are you sure you want to reset the config?')}) %}
       <a href="{% url_for controller='admin', action='reset_config' %}" class="btn btn-danger pull-left" data-module="confirm-action" data-module-i18n="{{ locale }}">{{ _('Reset') }}</a>
-      <button type="submit" class="btn btn-primary" name="save">{{ _('Update') }}</button>
+      <button type="submit" class="btn btn-primary" name="save">{{ _('Update Config') }}</button>
     </div>
   </form>
 {% endblock %}
diff --git a/ckan/templates/group/edit.html b/ckan/templates/group/edit.html
index 57808056d54..c86f0db2306 100644
--- a/ckan/templates/group/edit.html
+++ b/ckan/templates/group/edit.html
@@ -4,7 +4,7 @@
   <li>{% link_for _('Groups'), controller='group', action='index' %}</li>
   {% block breadcrumb_content_inner %}
     <li>{% link_for group.display_name|truncate(35), controller='group', action='read', id=group.name %}</li>
-    <li class="active">{% link_for _('Edit'), controller='group', action='edit', id=group.name %}</li>
+    <li class="active">{% link_for _('Manage'), controller='group', action='edit', id=group.name %}</li>
   {% endblock %}
 {% endblock %}
 
diff --git a/ckan/templates/group/edit_base.html b/ckan/templates/group/edit_base.html
index a5f1203d529..ebaf91a33de 100644
--- a/ckan/templates/group/edit_base.html
+++ b/ckan/templates/group/edit_base.html
@@ -6,12 +6,12 @@
   <li>{% link_for _('Groups'), controller='group', action='index' %}</li>
   {% block breadcrumb_content_inner %}
     <li>{% link_for group.display_name|truncate(35), controller='group', action='read', id=group.name %}</li>
-    <li class="active">{% link_for _('Edit'), controller='group', action='edit', id=group.name %}</li>
+    <li class="active">{% link_for _('Manage'), controller='group', action='edit', id=group.name %}</li>
   {% endblock %}
 {% endblock %}
 
 {% block content_action %}
-  {% link_for _('View group'), controller='group', action='read', id=c.group_dict.name, class_='btn', icon='eye-open' %}
+  {% link_for _('View'), controller='group', action='read', id=c.group_dict.name, class_='btn', icon='eye-open' %}
 {% endblock %}
 
 {% block content_primary_nav %}
diff --git a/ckan/templates/group/new.html b/ckan/templates/group/new.html
index 23d66facb05..1d78ac40010 100644
--- a/ckan/templates/group/new.html
+++ b/ckan/templates/group/new.html
@@ -2,7 +2,7 @@
 
 {% block subtitle %}{{ _('Create a Group') }}{% endblock %}
 
-{% block breadcrumb_link %}{{ h.nav_link(_('Create Group'), controller='group', action='edit', id=c.group.name) }}{% endblock %}
+{% block breadcrumb_link %}{{ h.nav_link(_('Create a Group'), controller='group', action='edit', id=c.group.name) }}{% endblock %}
 
 {% block page_heading %}{{ _('Create a Group') }}{% endblock %}
 
diff --git a/ckan/templates/group/read_base.html b/ckan/templates/group/read_base.html
index afa92f2038f..66f9b67bb53 100644
--- a/ckan/templates/group/read_base.html
+++ b/ckan/templates/group/read_base.html
@@ -9,7 +9,7 @@
 
 {% block content_action %}
   {% if h.check_access('group_update', {'id': c.group_dict.id}) %}
-    {% link_for _('Edit'), controller='group', action='edit', id=c.group_dict.name, class_='btn', icon='wrench' %}
+    {% link_for _('Manage'), controller='group', action='edit', id=c.group_dict.name, class_='btn', icon='wrench' %}
   {% endif %}
 {% endblock %}
 
diff --git a/ckan/templates/organization/edit_base.html b/ckan/templates/organization/edit_base.html
index 6f29a82b1f8..12ab58c2201 100644
--- a/ckan/templates/organization/edit_base.html
+++ b/ckan/templates/organization/edit_base.html
@@ -8,15 +8,14 @@
   <li>{% link_for _('Organizations'), controller='organization', action='index' %}</li>
   {% block breadcrumb_content_inner %}
     <li>{% link_for organization.display_name|truncate(35), controller='organization', action='read', id=organization.name %}</li>
-    <li class="active">{% link_for _('Admin'), controller='organization', action='edit', id=organization.name %}</li>
+    <li class="active">{% link_for _('Manage'), controller='organization', action='edit', id=organization.name %}</li>
   {% endblock %}
 {% endblock %}
 
 {% block content_action %}
   {% if organization and h.check_access('organization_update', {'id': organization.id}) %}
-    {% link_for _('View organization'), controller='organization', action='read', id=organization.name, class_='btn', icon='eye-open' %}
+    {% link_for _('View'), controller='organization', action='read', id=organization.name, class_='btn', icon='eye-open' %}
   {% endif %}
-  {# <li>{% link_for _('History'), controller='organization', action='history', id=organization.name, class_='btn', icon='undo' %}</li> #}
 {% endblock %}
 
 {% block content_primary_nav %}
diff --git a/ckan/templates/organization/read_base.html b/ckan/templates/organization/read_base.html
index d5a0f8120d5..329bccbeee5 100644
--- a/ckan/templates/organization/read_base.html
+++ b/ckan/templates/organization/read_base.html
@@ -9,7 +9,7 @@
 
 {% block content_action %}
   {% if h.check_access('organization_update', {'id': c.group_dict.id}) %}
-    {% link_for _('Admin'), controller='organization', action='edit', id=c.group_dict.name, class_='btn', icon='wrench' %}
+    {% link_for _('Manage'), controller='organization', action='edit', id=c.group_dict.name, class_='btn', icon='wrench' %}
   {% endif %}
 {% endblock %}
 
diff --git a/ckan/templates/package/read_base.html b/ckan/templates/package/read_base.html
index 9cf73a5c5a1..261c24499e2 100644
--- a/ckan/templates/package/read_base.html
+++ b/ckan/templates/package/read_base.html
@@ -16,7 +16,7 @@
 
 {% block content_action %}
   {% if h.check_access('package_update', {'id':pkg.id }) %}
-    {% link_for _('Edit'), controller='package', action='edit', id=pkg.name, class_='btn', icon='wrench' %}
+    {% link_for _('Manage'), controller='package', action='edit', id=pkg.name, class_='btn', icon='wrench' %}
   {% endif %}
 {% endblock %}
 
diff --git a/ckan/templates/package/resource_read.html b/ckan/templates/package/resource_read.html
index 46406746a6f..dee83c32e0d 100644
--- a/ckan/templates/package/resource_read.html
+++ b/ckan/templates/package/resource_read.html
@@ -27,7 +27,7 @@
           <ul>
             {% block resource_actions_inner %}
             {% if h.check_access('package_update', {'id':pkg.id }) %}
-              <li>{% link_for _('Edit'), controller='package', action='resource_edit', id=pkg.name, resource_id=res.id, class_='btn', icon='wrench' %}</li>
+              <li>{% link_for _('Manage'), controller='package', action='resource_edit', id=pkg.name, resource_id=res.id, class_='btn', icon='wrench' %}</li>
             {% endif %}
             {% if res.url %}
               <li>
diff --git a/ckan/templates/package/snippets/package_form.html b/ckan/templates/package/snippets/package_form.html
index 33d726639f1..39a4783b474 100644
--- a/ckan/templates/package/snippets/package_form.html
+++ b/ckan/templates/package/snippets/package_form.html
@@ -38,9 +38,6 @@
           <a class="btn btn-danger pull-left" href="{% url_for controller='package', action='delete', id=data.id %}" data-module="confirm-action" data-module-i18n="{{ locale }}">{% block delete_button_text %}{{ _('Delete') }}{% endblock %}</a>
         {% endif %}
       {% endblock %}
-      {% block cancel_button %}
-        <a class="btn" href="">{% block cancel_button_text %}{{ _('Cancel') }}{% endblock %}</a>
-      {% endblock %}
       <button class="btn btn-primary" type="submit" name="save">{% block save_button_text %}{{ _('Next: Add Data') }}{% endblock %}</button>
     </div>
   {% endblock %}
diff --git a/ckan/templates/user/snippets/login_form.html b/ckan/templates/user/snippets/login_form.html
index d1b54251137..e6a88d95902 100644
--- a/ckan/templates/user/snippets/login_form.html
+++ b/ckan/templates/user/snippets/login_form.html
@@ -24,6 +24,6 @@
   {{ form.checkbox('remember', label=_("Remember me"), id='field-remember', checked=true, value="63072000") }}
 
   <div class="form-actions">
-    <button class="btn btn-primary" type="submit">{{ _('Log in') }}</button>
+    <button class="btn btn-primary" type="submit">{{ _('Login') }}</button>
   </div>
 </form>