diff --git a/plinth/modules/users/templates/users_list.html b/plinth/modules/users/templates/users_list.html
index 9f3e54335..edf6ee28f 100644
--- a/plinth/modules/users/templates/users_list.html
+++ b/plinth/modules/users/templates/users_list.html
@@ -6,18 +6,6 @@
 {% load bootstrap %}
 {% load i18n %}
 
-{% block page_head %}
-  <style type="text/css">
-    .user-edit-label {
-      display: inline-block;
-      width: 75%;
-    }
-    .list-group-item .btn {
-      margin: -0.3125rem 0;
-    }
-  </style>
-{% endblock %}
-
 {% block configuration %}
 
   <h3>{% trans "Users" %}</h3>
@@ -32,29 +20,29 @@
 
   <div class="row">
     <div class="col-md-6">
-      <div class="list-group">
+      <div class="list-group list-group-two-column">
         {% for user in object_list %}
-          <div class="list-group-item clearfix">
-            {% if user.username != last_admin_user %}
-              <a href="{% url 'users:delete' user.username %}"
-                class="btn btn-default btn-sm pull-right"
-                role="button"
-                title="{% blocktrans with username=user.username %}Delete user {{ username }}{% endblocktrans %}">
-                <span class="fa fa-trash-o"
-                      aria-hidden="true"></span>
-              </a>
-            {% endif %}
-
-            <a class='user-edit-label'
+          <div class="list-group-item">
+            <a class='user-edit-label primary'
                href="{% url 'users:edit' user.username %}"
                title="{% blocktrans with username=user.username %}Edit user {{ username }}{% endblocktrans %}">
               {{ user.username }}
             </a>
 
             {% if not user.is_active %}
-              <span class="fa fa-ban"
+              <span class="fa fa-ban primary"
                     aria-hidden="true"></span>
             {% endif %}
+
+            {% if user.username != last_admin_user %}
+              <a href="{% url 'users:delete' user.username %}"
+                 class="btn btn-default btn-sm secondary"
+                 role="button"
+                 title="{% blocktrans with username=user.username %}Delete user {{ username }}{% endblocktrans %}">
+                <span class="fa fa-trash-o"
+                      aria-hidden="true"></span>
+              </a>
+            {% endif %}
           </div>
         {% endfor %}
       </div>