diff --git a/authentic2/manager/templates/authentic2/manager/role.html b/authentic2/manager/templates/authentic2/manager/role.html
index f213987..6113209 100644
--- a/authentic2/manager/templates/authentic2/manager/role.html
+++ b/authentic2/manager/templates/authentic2/manager/role.html
@@ -9,15 +9,7 @@
 
 {% block content %}
    <div class="role-info">
-     <form id="delete-form" action="?delete" method="post">
-        {% csrf_token %}
-        <button>{% trans "Delete" %}</button>
-     </form>
-     <h3>{% trans "Users with role" %}: {{ active_role.name }} <a rel="popup" class="edit-button" href="{% url "a2-manager-role-edit" role_ref=active_role.ref %}">Edit</a></h3>
-     <div id="search-form">
-       {% trans "Search" %}: <input id="search-input" type="text" value="{{ request.GET.search }}">
-       <button id="search-input-clear-btn">{% trans "Clear" %}</button>
-     </div>
+     <h3 style="margin-top: 0;">{% trans "Users with role" %}: {{ active_role.name }}</h3>
 
      {% render_table users "authentic2/manager/table.html" %}
 
diff --git a/authentic2/manager/templates/authentic2/manager/roles.html b/authentic2/manager/templates/authentic2/manager/roles.html
index 88ae421..cff7425 100644
--- a/authentic2/manager/templates/authentic2/manager/roles.html
+++ b/authentic2/manager/templates/authentic2/manager/roles.html
@@ -3,7 +3,20 @@
 
 {% block title %}{{ block.super }} - {% trans "Roles management" %}{% endblock %}
 
-{% block page_title %}{% trans "Roles management" %}{% endblock %}
+{% block page_title %}{% trans "Roles management" %}
+{% if active_role %} — {{ active_role.name }}{% endif %}
+{% endblock %}
+
+{% block appbar %}
+  {{ block.super }}
+  {% if active_role %}
+  <a rel="popup" href="#" id="add-user-btn">{% trans "Delete" %}</a>
+  <a rel="popup" href="{% url "a2-manager-role-edit" role_ref=active_role.ref %}" id="add-user-btn">{% trans "Edit" %}</a>
+  {% else %}
+   <p><a href="{% url "a2-manager-role-add" %}" rel="popup">{% trans "Add role" %}</a></p>
+  {% endif %}
+{% endblock %}
+
 
 {% block sidebar %}
    <ul class="roles">
@@ -16,8 +29,15 @@
        </li>
      {% endfor %}
    </ul>
-   <p><a href="{% url "a2-manager-role-add" %}" rel="popup">{% trans "Add role" %}</a></p>
-   <p><a href="{% url "a2-manager-users" %}">{% trans "Users management" %}</a></p>
+
+   {% if active_role %}
+     <hr />
+     <div id="search-form">
+       <h3>{% trans "Search" %}</h3>
+       <input id="search-input" type="search" value="{{ request.GET.search }}">
+       <button>{% trans "Search" %}</button>
+     </div>
+   {% endif %}
 {% endblock %}
 
 {% block content %}
diff --git a/authentic2/manager/templates/authentic2/manager/users.html b/authentic2/manager/templates/authentic2/manager/users.html
index 9c39cd0..da9bebe 100644
--- a/authentic2/manager/templates/authentic2/manager/users.html
+++ b/authentic2/manager/templates/authentic2/manager/users.html
@@ -14,12 +14,11 @@
   <div>
     <h3>{% trans "Search" %}</h3>
      <div id="search-form">
-       <input id="search-input" type="text" value="{{ request.GET.search }}">
-       <button id="search-input-clear-btn">{% trans "Clear" %}</button>
+       <input id="search-input" type="search" value="{{ request.GET.search }}">
+       <button>{% trans "Search" %}</button>
      </div>
   </div>
   <p>{{ users.count }} users</p>
-  <p><a href="{% url "a2-manager-roles" %}">{% trans "Roles management" %}</a></p>
 {% endblock %}
 
 {% block content %}