diff --git a/templates/accounts/group_edit.html b/templates/accounts/group_edit.html
index 1655af1..4c2651b 100644
--- a/templates/accounts/group_edit.html
+++ b/templates/accounts/group_edit.html
@@ -6,6 +6,12 @@
 
 {% block grouptab %} class="active"{% endblock %}
 
+{% block moretabs %}
+{% if group %}
+<a href="{% url 'add-group' %}" class="pull-right btn btn-success">Add group</a>
+{% endif %}
+{% endblock %}
+
 {% block tabcontent %}
 
 <div class="row">
diff --git a/templates/accounts/team_edit.html b/templates/accounts/team_edit.html
index df824ed..f5a839a 100644
--- a/templates/accounts/team_edit.html
+++ b/templates/accounts/team_edit.html
@@ -6,6 +6,12 @@
 
 {% block teamtab %} class="active"{% endblock %}
 
+{% block moretabs %}
+{% if team %}
+<a href="{% url 'add-team' %}" class="pull-right btn btn-success">Add team</a>
+{% endif %}
+{% endblock %}
+
 {% block tabcontent %}
 
 <div class="row">
diff --git a/templates/accounts/user_edit.html b/templates/accounts/user_edit.html
index 465d194..f100f49 100644
--- a/templates/accounts/user_edit.html
+++ b/templates/accounts/user_edit.html
@@ -6,6 +6,12 @@
 
 {% block usertab %} class="active"{% endblock %}
 
+{% block moretabs %}
+{% if user %}
+<a href="{% url 'add-user' %}" class="pull-right btn btn-success">Add user</a>
+{% endif %}
+{% endblock %}
+
 {% block tabcontent %}
 
 <div class="row">
diff --git a/templates/accounts/user_list.html b/templates/accounts/user_list.html
index caad3b5..979adf7 100644
--- a/templates/accounts/user_list.html
+++ b/templates/accounts/user_list.html
@@ -8,9 +8,7 @@
 {% block usertab %} class="active"{% endblock %}
 
 {% block moretabs %}
-<div class="pull-right">
-  <a href="{% url 'add-user' %}" class="btn btn-success">Add user</a>
-</div>
+<a href="{% url 'add-user' %}" class="pull-right btn btn-success">Add user</a>
 {% endblock %}
 
 {% block tabcontent %}
diff --git a/templates/permissions/global_perm_edit.html b/templates/permissions/global_perm_edit.html
index 451cd20..5a5f7b1 100644
--- a/templates/permissions/global_perm_edit.html
+++ b/templates/permissions/global_perm_edit.html
@@ -8,7 +8,9 @@
 {% block permtab %} class="active"{% endblock %}
 
 {% block moretabs %}
-<a href="#" data-action="{% url 'add-global-permission' %}" data-toggle="modal" data-target="#add-perm-form-modal" class="pull-right btn btn-success">Add permission</a>
+{% if permission %}
+<a href="{% url 'add-global-permission' %}" class="pull-right btn btn-success">Add permission</a>
+{% endif %}
 {% endblock %}
 
 {% block tabcontent %}
diff --git a/templates/permissions/project_perm_edit.html b/templates/permissions/project_perm_edit.html
index 3bca1b5..e77c691 100644
--- a/templates/permissions/project_perm_edit.html
+++ b/templates/permissions/project_perm_edit.html
@@ -7,9 +7,9 @@
 
 {% block moretabs %}
   <li class="active"><a href="{% url 'list-project-permission' project.name %}"><b>Permissions</b></a></li>
-  <div class="pull-right">
-    <a href="#" data-action="{% url 'add-global-permission' %}" data-toggle="modal" data-target="#add-perm-form-modal" class="btn btn-success">Add permission</a>
-  </div>
+  {% if permission %}
+  <a href="{% url 'add-project-permission' project.name %}" class="pull-right btn btn-success">Add permission</a>
+  {% endif %}
 {% endblock %}
 
 {% block tabcontent %}
diff --git a/templates/tracker/issue_base.html b/templates/tracker/issue_base.html
index eb486c4..db73344 100644
--- a/templates/tracker/issue_base.html
+++ b/templates/tracker/issue_base.html
@@ -9,6 +9,8 @@
     <a href="{% url 'list-issue' project.name %}?q=is:close{% if is_all_query %} {{ is_all_query }}{% endif %}{{ sort }}" class="btn btn-default{{ is_close }}">Close</a>
     <a href="{% url 'list-issue' project.name %}?q={% if is_all_query %}{{ is_all_query }}{% else %}*{% endif %}{{ sort }}" class="btn btn-default{{ is_all }}">All</a>
   </div>
+  {% if perm.create_issue %}
   <a href="{% url 'add-issue' project.name %}" class="btn btn-success">New issue</a>
+  {% endif %}
 </div>
 {% endblock %}
diff --git a/templates/tracker/label_edit.html b/templates/tracker/label_edit.html
index 41e653a..0ee09d8 100644
--- a/templates/tracker/label_edit.html
+++ b/templates/tracker/label_edit.html
@@ -4,6 +4,12 @@
 
 {% block labeltab %} class="active"{% endblock %}
 
+{% block moretabs %}
+{% if label %}
+<a href="{% url 'add-label' project.name %}" class="pull-right btn btn-success">New label</a>
+{% endif %}
+{% endblock %}
+
 {% block tabcontent %}
 
 <div class="row">
diff --git a/templates/tracker/label_list.html b/templates/tracker/label_list.html
index 88f22ec..c27bf26 100644
--- a/templates/tracker/label_list.html
+++ b/templates/tracker/label_list.html
@@ -6,9 +6,7 @@
 
 {% if perm.manage_tags %}
 {% block moretabs %}
-<div class="pull-right">
-  <a href="{% url 'add-label' project.name %}" class="btn btn-success">New label</a>
-</div>
+<a href="{% url 'add-label' project.name %}" class="pull-right btn btn-success">New label</a>
 {% endblock %}
 {% endif %}
 
diff --git a/templates/tracker/milestone_edit.html b/templates/tracker/milestone_edit.html
index df52628..780691f 100644
--- a/templates/tracker/milestone_edit.html
+++ b/templates/tracker/milestone_edit.html
@@ -6,9 +6,11 @@
 
 {% block moretabs %}
 <div class="pull-right">
-  <a href="{% url 'list-milestone' project.name %}?show=open" class="btn btn-default btn-sm{% if show == 'open' %} active{% endif %}">Open</a>
-  <a href="{% url 'list-milestone' project.name %}?show=close" class="btn btn-default btn-sm{% if show == 'close' %} active{% endif %}">Close</a>
-  <a href="{% url 'list-milestone' project.name %}?show=all" class="btn btn-default btn-sm{% if show == 'all' %} active{% endif %}">All</a>
+  <div class="btn-group">
+    <a href="{% url 'list-milestone' project.name %}?show=open" class="btn btn-default{% if show == 'open' %} active{% endif %}">Open</a>
+    <a href="{% url 'list-milestone' project.name %}?show=close" class="btn btn-default{% if show == 'close' %} active{% endif %}">Close</a>
+    <a href="{% url 'list-milestone' project.name %}?show=all" class="btn btn-default{% if show == 'all' %} active{% endif %}">All</a>
+  </div>
   {% if perm.manage_tags %}
   <a href="{% url 'add-milestone' project.name %}" class="btn btn-success">New milestone</a>
   {% endif %}