diff --git a/pagure/templates/settings.html b/pagure/templates/settings.html
index f2e4749..26bc442 100644
--- a/pagure/templates/settings.html
+++ b/pagure/templates/settings.html
@@ -107,7 +107,7 @@
 </section>
 
 <section class="users">
-  <h2>Users</h2>
+  <h2>Users and Groups</h2>
 
   <p>Here below is the list of user having commit rights to this repo.</p>
 
@@ -116,6 +116,11 @@
         class="icon icon-plus-sign blue">
         [add]
     </a>
+
+    <a href="{{ url_for('.add_group', username=username, repo=repo.name) }}"
+        class="icon icon-plus-sign blue">
+        [add group]
+    </a>
   </p>
 
   <ul>
@@ -137,6 +142,20 @@
       </form>
     </li>
   {% endfor %}
+  {% for group in repo.groups %}
+    <li>
+      <a href="{{ url_for('.view_group', group=group.group_name) }}">@{{ group.group_name }}</a>
+      <form class="icon del_icon" method="POST"
+        action="">
+        <button
+          onclick="return confirm('You sure you want to remove this group from this project?');"
+          title="Remove group">
+          <span class="icon icon-trash blue"></span>
+        </button>
+        {{ form.csrf_token }}
+      </form>
+    </li>
+  {% endfor %}
   </ul>
 </section>