diff --git a/adminsec/templates/adminsec/overview.html b/adminsec/templates/adminsec/overview.html
index 43d0ff2..0e95ee5 100644
--- a/adminsec/templates/adminsec/overview.html
+++ b/adminsec/templates/adminsec/overview.html
@@ -4,16 +4,13 @@
 
   <h2 class="mb-5 mt-5">
     <span class="fw-light">
-      Welcome {% if user.first_name or user.last_name %} {{ user.first_name }} {{ user.last_name }}{% else %}{{ user.username }}{% endif %}
-      &mdash;
+      Welcome {% if user.first_name or user.last_name %} {{ user.first_name }} {{ user.last_name }}{% else %}{{ user.username }}{% endif %}!
     </span>
-    Open Requests
     <a href="{% url 'adminsec:termsandconditions-list' %}" class="btn btn-secondary float-end">
-      <i class="iconify" data-icon="mdi:format-list-bulleted"></i>
       Terms &amp; Conditions
     </a>
   </h2>
 
-  {% include "usersec/modules/request_grid.html" %}
+  {% include "adminsec/requests.html" %}
 
 {% endblock content %}
diff --git a/adminsec/templates/adminsec/requests.html b/adminsec/templates/adminsec/requests.html
new file mode 100644
index 0000000..ce28360
--- /dev/null
+++ b/adminsec/templates/adminsec/requests.html
@@ -0,0 +1,35 @@
+{% load common %}
+
+<table class="table">
+  <thead>
+    <tr>
+      <th>Request Type</th>
+      <th>Requester</th>
+      <th>Created</th>
+      <th>Modified</th>
+    </tr>
+  </thead>
+  <tbody>
+    {% for obj in pending_requests %}
+      <tr>
+        <td>
+          <a href="{{ obj|get_detail_url:user }}" class="btn btn-dark btn-sm">
+            <i class="iconify" data-icon="mdi:eye"></i>
+            {{ obj.get_request_type }}
+          </a>
+        </td>
+        <td>{{ obj.requester.name }}</td>
+        <td>{{ obj.date_created|date:"Y-m-d H:i" }}</td>
+        <td>{{ obj.date_modified|date:"Y-m-d H:i" }}</td>
+      </tr>
+      {% empty %}
+      <tr>
+        <td colspan="4" class="text-center">
+          <em class="text-muted">No pending requests.</em>
+        </td>
+      </tr>
+    {% endfor %}
+  </tbody>
+</table>
+
+
diff --git a/adminsec/views.py b/adminsec/views.py
index 7bb139f..0566010 100644
--- a/adminsec/views.py
+++ b/adminsec/views.py
@@ -1,5 +1,6 @@
 import unicodedata
 from datetime import datetime
+from itertools import chain
 
 from django.conf import settings
 from django.contrib import messages
@@ -174,32 +175,16 @@ def get_context_data(self, **kwargs):
         # Used as switch in template
         context["admin"] = True
 
-        # Add open HpcGroupCreateRequest
-        context["hpcgroupcreaterequests"] = HpcGroupCreateRequest.objects.active()
-
-        # Add open HpcUserCreateRequest
-        context["hpcusercreaterequests"] = HpcUserCreateRequest.objects.active()
-
-        # Add open HpcProjectCreateRequest
-        context["hpcprojectcreaterequests"] = HpcProjectCreateRequest.objects.active()
-
-        # Add open HpcUserChangeRequest
-        context["hpcuserchangerequests"] = HpcUserChangeRequest.objects.active()
-
-        # Add open HpcGroupChangeRequest
-        context["hpcgroupchangerequests"] = HpcGroupChangeRequest.objects.active()
-
-        # Add open HpcProjectChangeRequest
-        context["hpcprojectchangerequests"] = HpcProjectChangeRequest.objects.active()
-
-        # Add open HpcGroupDeleteRequest
-        context["hpcgroupdeleterequests"] = None
-
-        # Add open HpcUserDeleteRequest
-        context["hpcuserdeleterequests"] = None
-
-        # Add open HpcProjectDeleteRequest
-        context["hpcprojectdeleterequests"] = None
+        context["pending_requests"] = list(
+            chain(
+                HpcGroupCreateRequest.objects.active(),
+                HpcGroupChangeRequest.objects.active(),
+                HpcProjectCreateRequest.objects.active(),
+                HpcProjectChangeRequest.objects.active(),
+                HpcUserCreateRequest.objects.active(),
+                HpcUserChangeRequest.objects.active(),
+            )
+        )
 
         return context
 
@@ -240,6 +225,7 @@ def get_context_data(self, **kwargs):
         context["is_active"] = obj.is_active()
         context["is_revision"] = obj.is_revision()
         context["is_revised"] = obj.is_revised()
+        context["is_archived"] = obj.is_archived()
         context["hpc_group_name_suggestion"] = obj.name if obj.name else name
         tier1_work = folders.get("tier1_work")
         tier1_scratch = folders.get("tier1_scratch")
@@ -490,6 +476,7 @@ def get_context_data(self, **kwargs):
         context["is_active"] = obj.is_active()
         context["is_revision"] = obj.is_revision()
         context["is_revised"] = obj.is_revised()
+        context["is_archived"] = obj.is_archived()
         context["admin"] = True
         return context
 
@@ -659,6 +646,7 @@ def get_context_data(self, **kwargs):
         context["is_active"] = obj.is_active()
         context["is_revision"] = obj.is_revision()
         context["is_revised"] = obj.is_revised()
+        context["is_archived"] = obj.is_archived()
         context["admin"] = True
         return context
 
@@ -822,6 +810,7 @@ def get_context_data(self, **kwargs):
         context["is_active"] = obj.is_active()
         context["is_revision"] = obj.is_revision()
         context["is_revised"] = obj.is_revised()
+        context["is_archived"] = obj.is_archived()
         context["hpc_project_name_suggestion"] = name
         tier1_work = folders.get("tier1_work")
         tier1_scratch = folders.get("tier1_scratch")
@@ -970,12 +959,14 @@ def post(self, request, *args, **kwargs):
                 creator=self.request.user,
                 status=OBJECT_STATUS_ACTIVE,
                 expiration=obj.expiration,
+                delegate=obj.delegate,
             )
-            project.members.add(obj.group.owner)
-            project.version_history.last().members.add(obj.group.owner)
+            members = list(obj.members.all())
+            project.members.add(*members)
+            project.get_latest_version().members.add(*members)
 
             # Create invitations for users
-            for member in obj.members.all():
+            for member in members:
                 if member == obj.group.owner:
                     continue
 
@@ -1084,6 +1075,7 @@ def get_context_data(self, **kwargs):
         context["is_active"] = obj.is_active()
         context["is_revision"] = obj.is_revision()
         context["is_revised"] = obj.is_revised()
+        context["is_archived"] = obj.is_archived()
         context["admin"] = True
         return context
 
@@ -1237,6 +1229,7 @@ def get_context_data(self, **kwargs):
         context["is_active"] = obj.is_active()
         context["is_revision"] = obj.is_revision()
         context["is_revised"] = obj.is_revised()
+        context["is_archived"] = obj.is_archived()
         context["admin"] = True
         return context
 
@@ -1244,7 +1237,7 @@ def get_context_data(self, **kwargs):
 class HpcProjectChangeRequestRevisionView(HpcPermissionMixin, UpdateView):
     """HPC project change request revision view."""
 
-    template_name = "usersec/hpcprojectchangerequest_form.html"
+    template_name = "usersec/hpcprojectcreaterequest_form.html"
     model = HpcProjectChangeRequest
     form_class = HpcProjectChangeRequestForm
     slug_field = "uuid"
diff --git a/hpcaccess/static/js/project.js b/hpcaccess/static/js/project.js
index 999c904..7f8c9c2 100644
--- a/hpcaccess/static/js/project.js
+++ b/hpcaccess/static/js/project.js
@@ -4,7 +4,7 @@
 function mergeToJson() {
     var content = []
     $(".mergeToJson").each(function () {
-        content.push('"' + $(this).attr("name") + '": "' + $(this).val() + '"');
+        content.push('"' + $(this).attr("name") + '": ' + $(this).val());
     });
     $("#id_resources_requested").val("{" + content.join(", ") + "}")
 }
diff --git a/hpcaccess/templates/pages/login.html b/hpcaccess/templates/pages/login.html
index 894ec28..11dc229 100644
--- a/hpcaccess/templates/pages/login.html
+++ b/hpcaccess/templates/pages/login.html
@@ -4,11 +4,10 @@
 
 {% block content %}
 <div class="container-fluid">
-
-  <p>
-    Welcome to <hb>HPC Access</hb>.
-  </p>
-  <p>
+  <h2 class="mt-5">
+    Welcome to <strong>HPC Access</strong>!
+  </h2>
+  <p class="mt-4">
     This website allows users of the <strong>BIH HPC cluster</strong> to
   </p>
   <ul>
@@ -24,8 +23,8 @@
     <li>create projects with dedicated and collaborative storage resources,</li>
     <li>and make requests for additional group/project resources.</li>
   </ul>
-  <hr />
-  <p>
+  <hr class="mt-4" />
+  <p class="mt-4">
     Please log in using your Charité or MDC account.
   </p>
 
@@ -40,7 +39,6 @@
       <select id="login-domain" name="domain" class="form-select">
         <option value="CHARITE">Charité</option>
         <option value="MDC-BERLIN">MDC</option>
-        <option value=""></option>
       </select>
     </div>
     <input type="password" name="password" id="login-password"
diff --git a/usersec/forms.py b/usersec/forms.py
index 2489c13..a1678df 100644
--- a/usersec/forms.py
+++ b/usersec/forms.py
@@ -25,6 +25,32 @@
 )
 
 
+def build_option(member):
+    return (
+        str(member.id),
+        "{} {} ({}, AG {})".format(
+            member.user.first_name,
+            member.user.last_name,
+            member.username,
+            member.primary_group.name,
+        ),
+    )
+
+
+def get_project_resource(resource, instance, project=None):
+    default = DEFAULT_PROJECT_RESOURCES[resource]
+
+    if project:
+        project_resources = project.resources_requested.get(resource, default)
+    else:
+        project_resources = default
+
+    if instance:
+        return instance.resources_requested.get(resource, project_resources)
+
+    return project_resources
+
+
 class HpcGroupCreateRequestForm(forms.ModelForm):
     """Form for HpcGroupCreateRequest."""
 
@@ -57,7 +83,6 @@ def __init__(self, *args, user, **kwargs):
             )
 
         else:
-            print("hiding description and expiration fields because user is hpcadmin")
             self.fields["description"].widget = forms.HiddenInput()
             self.fields["expiration"].widget = forms.HiddenInput()
             self.fields["comment"].required = True
@@ -91,7 +116,6 @@ def __init__(self, *args, user, group, **kwargs):
         super().__init__(*args, **kwargs)
 
         self.fields["resources_requested"].widget = forms.HiddenInput()
-        self.fields["resources_requested"].initial = group.resources_requested
         self.fields["description"].initial = group.description
         self.fields["delegate"].initial = group.delegate
         self.fields["delegate"].queryset = HpcUser.objects.filter(
@@ -290,30 +314,18 @@ class Meta:
 
     def __init__(self, *args, user=None, group=None, **kwargs):
         super().__init__(*args, **kwargs)
-        instance = kwargs['instance']
-
-        def build_option(member, group):
-            return (
-                str(member.id),
-                "{} {} ({}, AG {})".format(member.user.first_name, member.user.last_name, member.username, group.name),
-            )
-        
-        def get_resource(resource, instance):
-            if instance:
-                return instance.resources_requested.get(resource, DEFAULT_PROJECT_RESOURCES[resource])
-            return DEFAULT_PROJECT_RESOURCES[resource]
+        instance = kwargs["instance"]
 
         self.fields["resources_requested"].widget = forms.HiddenInput()
         self.fields["delegate"].choices = [("", "Select Delegate ...")]
 
         if instance:
             self.fields["members"].choices = [
-                build_option(member, instance.group)
-                for member in instance.members.all()
+                build_option(member) for member in instance.members.all()
             ]
-            self.fields["members"].initial = kwargs['instance'].members.all()
+            self.fields["members"].initial = instance.members.all()
             self.fields["delegate"].choices += [
-                build_option(member, instance.group)
+                build_option(member)
                 for member in instance.members.all()
                 if not member == instance.group.owner
             ]
@@ -349,7 +361,7 @@ def get_resource(resource, instance):
                 ),
                 label="Fast Active Storage (Scratch) [TB]",
             )
-            self.fields["tier1_scratch"].initial = get_resource("tier1_scratch", instance)
+            self.fields["tier1_scratch"].initial = get_project_resource("tier1_scratch", instance)
             self.fields["tier1_scratch"].widget.attrs["class"] = "form-control mergeToJson"
 
             self.fields["tier1_work"] = forms.IntegerField(
@@ -360,7 +372,7 @@ def get_resource(resource, instance):
                 ),
                 label="Fast Active Storage (Work) [TB]",
             )
-            self.fields["tier1_work"].initial = get_resource("tier1_work", instance)
+            self.fields["tier1_work"].initial = get_project_resource("tier1_work", instance)
             self.fields["tier1_work"].widget.attrs["class"] = "form-control mergeToJson"
 
             self.fields["tier2_unmirrored"] = forms.IntegerField(
@@ -373,7 +385,9 @@ def get_resource(resource, instance):
                 ),
                 label="Long-Term Storage (Unmirrored) [TB]",
             )
-            self.fields["tier2_unmirrored"].initial = get_resource("tier2_unmirrored", instance)
+            self.fields["tier2_unmirrored"].initial = get_project_resource(
+                "tier2_unmirrored", instance
+            )
             self.fields["tier2_unmirrored"].widget.attrs["class"] = "form-control mergeToJson"
 
             self.fields["tier2_mirrored"] = forms.IntegerField(
@@ -386,7 +400,7 @@ def get_resource(resource, instance):
                 ),
                 label="Long-Term Storage (Mirrored) [TB]",
             )
-            self.fields["tier2_mirrored"].initial = get_resource("tier2_mirrored", instance)
+            self.fields["tier2_mirrored"].initial = get_project_resource("tier2_mirrored", instance)
             self.fields["tier2_mirrored"].widget.attrs["class"] = "form-control mergeToJson"
 
         else:
@@ -444,20 +458,38 @@ class Meta:
 
     def __init__(self, *args, user=None, project=None, **kwargs):
         super().__init__(*args, **kwargs)
+        instance = kwargs["instance"]
 
         self.fields["resources_requested"].widget = forms.HiddenInput()
-        self.fields["resources_requested"].initial = project.resources_requested
-        self.fields["description"].initial = project.description
-        self.fields["delegate"].initial = project.delegate
-        self.fields["delegate"].queryset = project.members.all()
-        self.fields["members"].initial = project.members.all().order_by("user__last_name")
-
-        # Exclude users from delegate selection that have no User associated
-        self.fields["delegate"].queryset = (
-            self.fields["delegate"]
-            .queryset.exclude(user__isnull=True)
-            .exclude(id=project.group.owner.id)
-        )
+        self.fields["delegate"].choices = [("", "Select Delegate ...")]
+
+        if instance:
+            self.fields["members"].choices = [
+                build_option(member) for member in instance.members.all()
+            ]
+            self.fields["members"].initial = instance.members.all()
+            self.fields["delegate"].choices += [
+                build_option(member)
+                for member in instance.members.all()
+                if not member == instance.project.group.owner
+            ]
+        elif project:
+            self.fields["resources_requested"].initial = project.resources_requested
+            self.fields["description"].initial = project.description
+
+            self.fields["members"].choices = [
+                build_option(member) for member in project.members.all().order_by("user__name")
+            ]
+            self.fields["members"].initial = project.members.all()
+            self.fields["delegate"].choices += [
+                build_option(member)
+                for member in project.members.all()
+                if not member == project.group.owner
+            ]
+            self.fields["delegate"].initial = project.delegate
+
+        self.fields["members"].widget.attrs["class"] = "d-none"
+        self.fields["delegate"].widget.attrs["class"] = "form-select"
 
         if not user.is_hpcadmin:
             if project.delegate == user.hpcuser_user.first():
@@ -491,7 +523,9 @@ def __init__(self, *args, user=None, project=None, **kwargs):
                 ),
                 label="Fast Active Storage (Scratch) [TB]",
             )
-            self.fields["tier1_scratch"].initial = DEFAULT_PROJECT_RESOURCES["tier1_scratch"]
+            self.fields["tier1_scratch"].initial = get_project_resource(
+                "tier1_scratch", instance, project
+            )
             self.fields["tier1_scratch"].widget.attrs["class"] = "form-control mergeToJson"
 
             self.fields["tier1_work"] = forms.IntegerField(
@@ -502,7 +536,9 @@ def __init__(self, *args, user=None, project=None, **kwargs):
                 ),
                 label="Fast Active Storage (Work) [TB]",
             )
-            self.fields["tier1_work"].initial = DEFAULT_PROJECT_RESOURCES["tier1_work"]
+            self.fields["tier1_work"].initial = get_project_resource(
+                "tier1_work", instance, project
+            )
             self.fields["tier1_work"].widget.attrs["class"] = "form-control mergeToJson"
 
             self.fields["tier2_unmirrored"] = forms.IntegerField(
@@ -515,7 +551,9 @@ def __init__(self, *args, user=None, project=None, **kwargs):
                 ),
                 label="Long-Term Storage (Unmirrored) [TB]",
             )
-            self.fields["tier2_unmirrored"].initial = DEFAULT_PROJECT_RESOURCES["tier2_unmirrored"]
+            self.fields["tier2_unmirrored"].initial = get_project_resource(
+                "tier2_unmirrored", instance, project
+            )
             self.fields["tier2_unmirrored"].widget.attrs["class"] = "form-control mergeToJson"
 
             self.fields["tier2_mirrored"] = forms.IntegerField(
@@ -528,7 +566,9 @@ def __init__(self, *args, user=None, project=None, **kwargs):
                 ),
                 label="Long-Term Storage (Mirrored) [TB]",
             )
-            self.fields["tier2_mirrored"].initial = DEFAULT_PROJECT_RESOURCES["tier2_mirrored"]
+            self.fields["tier2_mirrored"].initial = get_project_resource(
+                "tier2_mirrored", instance, project
+            )
             self.fields["tier2_mirrored"].widget.attrs["class"] = "form-control mergeToJson"
 
         else:
diff --git a/usersec/models.py b/usersec/models.py
index b4b3a48..c64a4e4 100644
--- a/usersec/models.py
+++ b/usersec/models.py
@@ -53,6 +53,9 @@
 #: Request retracted by requester.
 REQUEST_STATUS_RETRACTED = "RETRACTED"
 
+#: Request archived.
+REQUEST_STATUS_ARCHIVED = "ARCHIVED"
+
 #: Request statuses.
 REQUEST_STATUS_CHOICES = [
     (REQUEST_STATUS_INITIAL, REQUEST_STATUS_INITIAL),
@@ -62,6 +65,7 @@
     (REQUEST_STATUS_APPROVED, REQUEST_STATUS_APPROVED),
     (REQUEST_STATUS_DENIED, REQUEST_STATUS_DENIED),
     (REQUEST_STATUS_RETRACTED, REQUEST_STATUS_RETRACTED),
+    (REQUEST_STATUS_ARCHIVED, REQUEST_STATUS_ARCHIVED),
 ]
 
 #: Invitation created and waiting for decision.
@@ -278,6 +282,10 @@ def get_delete_url(self):
         class_name = self.__class__.__name__.lower()
         return reverse("usersec:{}-delete".format(class_name), kwargs={class_name: self.uuid})
 
+    def get_archive_url(self):
+        class_name = self.__class__.__name__.lower()
+        return reverse("usersec:{}-archive".format(class_name), kwargs={class_name: self.uuid})
+
 
 @unique
 class HpcQuotaStatus(Enum):
@@ -807,7 +815,6 @@ def __repr__(self):
             f"delegate={self.delegate.username if self.delegate else None},"
             f"gid={self.gid},"
             f"status={self.status},"
-            f"members={self.hpcuser.count()},"
             f"creator={self.creator.username if self.creator else None},"
             f"version={self.version})"
         )
@@ -1054,6 +1061,9 @@ def is_revised(self):
     def is_revision(self):
         return self.status == REQUEST_STATUS_REVISION
 
+    def is_archived(self):
+        return self.status == REQUEST_STATUS_ARCHIVED
+
     def display_status(self):
         mapping = {
             REQUEST_STATUS_INITIAL: "initial",
@@ -1067,13 +1077,13 @@ def display_status(self):
 
         return mapping.get(self.status, "unknown status")
 
-    def get_request_type(self):
-        cls_name = self.__class__.__name__
-        name = cls_name.replace("Request", "").replace("Hpc", "")
-        ret = re.findall(r"[A-Z](?:[a-z]+|[A-Z]*(?=[A-Z]|$))", name)
-        if ret:
-            return " ".join(ret)
-        return self.__class__.__name__
+    # def get_request_type(self):
+    #     cls_name = self.__class__.__name__
+    #     name = cls_name.replace("Request", "").replace("Hpc", "")
+    #     ret = re.findall(r"[A-Z](?:[a-z]+|[A-Z]*(?=[A-Z]|$))", name)
+    #     if ret:
+    #         return " ".join(ret)
+    #     return self.__class__.__name__
 
 
 # HpcGroupRequest related
diff --git a/usersec/templates/usersec/hpcgroupchangerequest_detail.html b/usersec/templates/usersec/hpcgroupchangerequest_detail.html
index 5ca981e..fd673b3 100644
--- a/usersec/templates/usersec/hpcgroupchangerequest_detail.html
+++ b/usersec/templates/usersec/hpcgroupchangerequest_detail.html
@@ -16,21 +16,10 @@ <h2 class="mt-5">
 </h2>
 
 {% if not admin %}
-<div class="mt-4 card bg-{{ object.status|colorize_request_status }}">
-  <div class="card-body lead text-light">
-    {% if object.status == "ACTIVE" %}
-      You've requested a change for your group.
-      We are working on your request and you will receive an email once we approve it.
-    {% elif object.status == "RETRACTED" %}
-      You have retracted your request to change your group. Click <strong>Re-activate</strong> to activate the request.
-    {% elif object.status == "REVISION" %}
-      We have asked for you to revise your request to change your group. See our comment and please answer any question.
-    {% endif %}
-  </div>
-</div>
+  {% include "usersec/modules/request_status_card.html" %}
 {% endif %}
   <div class="row mt-4">
-    <div class="col-sm-6">
+    <div class="col-sm-7">
       <dl class="row">
         {% include "usersec/modules/resources_requested.html" with object=object %}
 
@@ -47,7 +36,7 @@ <h2 class="mt-5">
         <dd class="col-sm-6">{{ object.expiration|date:"Y-m-d" }}</dd>
       </dl>
     </div>
-    <div class="col-sm-6">
+    <div class="col-sm-5">
       {% include "usersec/modules/comments.html" %}
     </div>
   </div>
diff --git a/usersec/templates/usersec/hpcgroupchangerequest_form.html b/usersec/templates/usersec/hpcgroupchangerequest_form.html
index 4a87e9a..e979a66 100644
--- a/usersec/templates/usersec/hpcgroupchangerequest_form.html
+++ b/usersec/templates/usersec/hpcgroupchangerequest_form.html
@@ -7,36 +7,32 @@
 
   <h2 class="mt-5">
     {% if update %}
-      Update group change request
+      {% if admin %}
+        Request Revision
+      {% else %}
+        Update Group Request
+      {% endif %}
     {% else %}
-      Request group change
+      Change Group Request
     {% endif %}
   </h2>
 
   {% include "usersec/modules/comments.html" %}
 
-  <form method="post" id="submit" data-is-admin="{{ admin }}">
+  <form method="post" class="mt-3 mb-3" id="submit" data-is-admin="{{ admin }}">
     {% csrf_token %}
     {% if admin %}
       <dl class="row">
-        <dt class="col-sm-3">Resource Quotas</dt>
-        <dd class="col-sm-9">
-          <dl class="row">
-            {% for key, value in object.resources_requested.items %}
-              <dt class="col-sm-3 text-muted">{{ key }}</dt>
-              <dd class="col-sm-9">{{ value }}</dd>
-            {% endfor %}
-          </dl>
-        </dd>
-
-        <dt class="col-sm-3">Requester</dt>
-        <dd class="col-sm-9">{{ object.requester.username }}</dd>
-
-        <dt class="col-sm-3">Description</dt>
-        <dd class="col-sm-9">{{ object.description }}</dd>
-
-        <dt class="col-sm-3">Expiration</dt>
-        <dd class="col-sm-9">{{ object.expiration|date:"Y-m-d" }}</dd>
+        {% include "usersec/modules/resources_requested.html" with object=object %}
+
+        <dt class="col-sm-6">Requester</dt>
+        <dd class="col-sm-6">{{ object.requester.username }}</dd>
+
+        <dt class="col-sm-6">Description</dt>
+        <dd class="col-sm-6">{{ object.description }}</dd>
+
+        <dt class="col-sm-6">Expiration</dt>
+        <dd class="col-sm-6">{{ object.expiration|date:"Y-m-d" }}</dd>
       </dl>
     {% endif %}
 
@@ -44,46 +40,52 @@ <h2 class="mt-5">
       {{ field }}
     {% endfor %}
 
-    {% for field in form.visible_fields %}
-      <div class="fieldWrapper">
-        {% if field.errors %}
-          <div class="alert alert-danger" role="alert">
-            {{ field.errors }}
-          </div>
-        {% endif %}
-        <div class="input-group mb-3">
-          <span class="input-group-text">
-            {% if field.field.required %}
-              <strong>{{ field.label }}<sup class="text-danger">*</sup></strong>
-            {% else %}
-              {{ field.label }}
-            {% endif %}
-          </span>
-          {{ field }}
-        </div>
-        {% if field.help_text %}
-          <p class="help small text-muted fst-italic">{{ field.help_text|safe }}</p>
-        {% endif %}
+    {% if admin %}
+    <div class="d-none">
+    {% endif %}
+
+    {% include "usersec/form_field.html" with field=form.description %}
+    {% include "usersec/form_field.html" with field=form.delegate %}
+    {% include "usersec/form_field.html" with field=form.expiration %}
+
+    <h4 class="mt-4">Resources</h4>
+
+    <div class="row mt-3">
+      <div class="col-md-6">
+        <h5>Tier 1</h5>
+        {% include "usersec/form_field.html" with field=form.tier1_scratch %}
       </div>
-    {% endfor %}
+      <div class="col-md-6">
+        <h5>Tier 2</h5>
+        {% include "usersec/form_field.html" with field=form.tier2_unmirrored %}
+      </div>
+    </div>
+    <div class="row">
+      <div class="col-md-6">
+        {% include "usersec/form_field.html" with field=form.tier1_work %}
+      </div>
+      <div class="col-md-6">
+        {% include "usersec/form_field.html" with field=form.tier2_mirrored %}
+      </div>
+    </div>
+
+    {% if admin %}
+    </div>
+    {% endif %}
+
+    {% include "usersec/form_field.html" with field=form.comment %}
 
-    <a class="btn btn-secondary"
-        href="{% url 'home' %}"
-    >
-      <i class="iconify" data-icon="mdi:arrow-left-bold"></i>
+    <a class="btn btn-secondary" href="{% url 'home' %}">
       Cancel
     </a>
     <button class="btn btn-primary" type="submit" id="id_submit_button">
       {% if update %}
         {% if admin %}
-          <i class="iconify" data-icon="mdi:comment"></i>
           Request Revision
         {% else %}
-          <i class="iconify" data-icon="mdi:refresh"></i>
           Update
         {% endif %}
       {% else %}
-        <i class="iconify" data-icon="mdi:upload"></i>
         Submit
       {% endif %}
     </button>
diff --git a/usersec/templates/usersec/hpcgroupcreaterequest_detail.html b/usersec/templates/usersec/hpcgroupcreaterequest_detail.html
index 57c80a7..dddd18a 100644
--- a/usersec/templates/usersec/hpcgroupcreaterequest_detail.html
+++ b/usersec/templates/usersec/hpcgroupcreaterequest_detail.html
@@ -5,10 +5,7 @@
 {% block content %}
 
 <h2 class="mt-5">
-  HPC Group Request
-  <span class="badge bg-{{ object.status|colorize_request_status }}">
-    {{ object.display_status }}
-  </span>
+  Group Request
   <span class="float-end">
     {% if admin %}
       {% include "usersec/modules/request_buttons_admin.html" %}
@@ -16,32 +13,11 @@ <h2 class="mt-5">
       {% include "usersec/modules/request_buttons_user.html" with omit_home_button=1 %}
     {% endif %}
   </span>
+
 </h2>
 
-{% if object.status == "ACTIVE" %}
-<div class="row">
-  <div class="col-12 alert alert-info">
-    We are working on your request and you will receive an email once we approve it.
-    Once your request has been approved, you can adjust the amount of resources that you applied for.
-  </div>
-</div>
-{% elif object.status == "RETRACTED" %}
-<div class="row">
-  <div class="col-12 alert alert-warning">
-    You have retracted your group creation request.
-    Click &quot;Re-activate&quot; to re-apply for group creation.
-  </div>
-</div>
-{% elif object.status == "REVISION" %}
-<div class="row">
-  <div class="col-12 alert alert-warning">
-    We have asked for you to revise your group request.
-    See our comment and please answer any question and/or update the resource requests.
-  </div>
-</div>
-{% endif %}
 {% if admin %}
-<div class="row" id="folder-name-warning">
+<div class="row mt-4" id="folder-name-warning">
   <div class="col-12 alert alert-warning">
     Note that you explicitly need to set the POSIX group name and the folder path for the group before approval.
     <ul>
@@ -50,113 +26,115 @@ <h2 class="mt-5">
     </ul>
   </div>
 </div>
+{% else %}
+  {% include "usersec/modules/request_status_card.html" %}
 {% endif %}
 
-<div class="row">
-  <div class="col-sm-7">
-    <dl class="row">
-      {% include "usersec/modules/resources_requested.html" with object=object %}
+<div class="row mt-4">
+  {% if admin %}
+    <div class="col-sm-7">
+      <dl class="row">
+        {% include "usersec/modules/resources_requested.html" with object=object %}
 
-      <dt class="col-sm-4">Requester</dt>
-      <dd class="col-sm-8">{{ object.requester.first_name }} {{ object.requester.last_name }} <span class="fw-light">({{ object.requester.username }})</span></dd>
+        <dt class="col-sm-4">Requester</dt>
+        <dd class="col-sm-8">{{ object.requester.first_name }} {{ object.requester.last_name }} <span class="fw-light">({{ object.requester.username }})</span></dd>
 
-      {% if admin %}
-      <dt class="col-sm-4">
-        POSIX Name
-        <span class="text-success" id="name-submitted-icon">
-          <i class="iconify" data-icon="mdi:check-bold" class="text-success"></i>
-        </span>
-      </dt>
-      <dd class="col-sm-8">
-        <div class="input-group">
-          <input
-                type="text"
-                class="form-control"
-                id="set-name-value"
-                placeholder="{{ hpc_group_name_suggestion }}"
-                value="{{ hpc_group_name_suggestion }}"
-                aria-label="Set Group Name"
-                aria-describedby="set-values-button set-name-response"
-                required>
-          <div id="set-name-response"></div>
-        </div>
-      </dd>
+        <dt class="col-sm-4">
+          POSIX Name
+          <span class="text-success" id="name-submitted-icon">
+            <i class="iconify" data-icon="mdi:check-bold" class="text-success"></i>
+          </span>
+        </dt>
+        <dd class="col-sm-8">
+          <div class="input-group">
+            <input
+                  type="text"
+                  class="form-control"
+                  id="set-name-value"
+                  placeholder="{{ hpc_group_name_suggestion }}"
+                  value="{{ hpc_group_name_suggestion }}"
+                  aria-label="Set Group Name"
+                  aria-describedby="set-values-button set-name-response"
+                  required>
+            <div id="set-name-response"></div>
+          </div>
+        </dd>
 
-      <dt class="col-sm-4">
-        Folders
-        <span class="text-success" id="folder-submitted-icon">
-          <i class="iconify" data-icon="mdi:check-bold" class="text-success"></i>
-        </span>
-      </dt>
-      <dd class="col-sm-8">
-        <h6><strong>Tier 1</strong></h6>
-        <div class="input-group">
-          <span class="input-group-text">Work</span>
-          <input
-                type="text"
-                class="form-control"
-                id="set-folder-tier1_work-value"
-                placeholder="{{ hpc_group_path_suggestion_tier1_work }}"
-                value="{{ hpc_group_path_suggestion_tier1_work }}"
-                aria-label="Set Folder"
-                aria-describedby="set-values-button set-folder-tier1_work-response"
-                required>
-          <div id="set-folder-tier1_work-response"></div>
-        </div>
-        <div class="input-group">
-          <span class="input-group-text">Scratch</span>
-          <input
-                type="text"
-                class="form-control"
-                id="set-folder-tier1_scratch-value"
-                placeholder="{{ hpc_group_path_suggestion_tier1_scratch }}"
-                value="{{ hpc_group_path_suggestion_tier1_scratch }}"
-                aria-label="Set Folder"
-                aria-describedby="set-values-button set-folder-tier1_scratch-response"
-                required>
-          <div id="set-folder-tier1_scratch-response"></div>
-        </div>
-        <h6 class="mt-3"><strong>Tier 2</strong></h6>
-        <div class="input-group">
-          <span class="input-group-text">Unmirrored</span>
-          <input
-                type="text"
-                class="form-control"
-                id="set-folder-tier2_unmirrored-value"
-                placeholder="{{ hpc_group_path_suggestion_tier2_unmirrored }}"
-                value="{{ hpc_group_path_suggestion_tier2_unmirrored }}"
-                aria-label="Set Folder"
-                aria-describedby="set-values-button set-folder-tier2_unmirrored-response"
-                required>
-          <div id="set-folder-tier2_unmirrored-response"></div>
-        </div>
-        <div class="input-group">
-          <span class="input-group-text">Mirrored</span>
-          <input
-                type="text"
-                class="form-control"
-                id="set-folder-tier2_mirrored-value"
-                placeholder="{{ hpc_group_path_suggestion_tier2_mirrored }}"
-                value="{{ hpc_group_path_suggestion_tier2_mirrored }}"
-                aria-label="Set Folder"
-                aria-describedby="set-values-button set-folder-tier2_mirrored-response"
-                required>
-          <div id="set-folder-tier2_mirrored-response"></div>
-        </div>
-        <div>
-          <button class="btn btn-outline-secondary" type="button" id="set-values-button">Submit</button>
-        </div>
-      </dd>
-      {% endif %}
+        <dt class="col-sm-4">
+          Folders
+          <span class="text-success" id="folder-submitted-icon">
+            <i class="iconify" data-icon="mdi:check-bold" class="text-success"></i>
+          </span>
+        </dt>
+        <dd class="col-sm-8">
+          <h6><strong>Tier 1</strong></h6>
+          <div class="input-group">
+            <span class="input-group-text">Work</span>
+            <input
+                  type="text"
+                  class="form-control"
+                  id="set-folder-tier1_work-value"
+                  placeholder="{{ hpc_group_path_suggestion_tier1_work }}"
+                  value="{{ hpc_group_path_suggestion_tier1_work }}"
+                  aria-label="Set Folder"
+                  aria-describedby="set-values-button set-folder-tier1_work-response"
+                  required>
+            <div id="set-folder-tier1_work-response"></div>
+          </div>
+          <div class="input-group">
+            <span class="input-group-text">Scratch</span>
+            <input
+                  type="text"
+                  class="form-control"
+                  id="set-folder-tier1_scratch-value"
+                  placeholder="{{ hpc_group_path_suggestion_tier1_scratch }}"
+                  value="{{ hpc_group_path_suggestion_tier1_scratch }}"
+                  aria-label="Set Folder"
+                  aria-describedby="set-values-button set-folder-tier1_scratch-response"
+                  required>
+            <div id="set-folder-tier1_scratch-response"></div>
+          </div>
+          <h6 class="mt-3"><strong>Tier 2</strong></h6>
+          <div class="input-group">
+            <span class="input-group-text">Unmirrored</span>
+            <input
+                  type="text"
+                  class="form-control"
+                  id="set-folder-tier2_unmirrored-value"
+                  placeholder="{{ hpc_group_path_suggestion_tier2_unmirrored }}"
+                  value="{{ hpc_group_path_suggestion_tier2_unmirrored }}"
+                  aria-label="Set Folder"
+                  aria-describedby="set-values-button set-folder-tier2_unmirrored-response"
+                  required>
+            <div id="set-folder-tier2_unmirrored-response"></div>
+          </div>
+          <div class="input-group">
+            <span class="input-group-text">Mirrored</span>
+            <input
+                  type="text"
+                  class="form-control"
+                  id="set-folder-tier2_mirrored-value"
+                  placeholder="{{ hpc_group_path_suggestion_tier2_mirrored }}"
+                  value="{{ hpc_group_path_suggestion_tier2_mirrored }}"
+                  aria-label="Set Folder"
+                  aria-describedby="set-values-button set-folder-tier2_mirrored-response"
+                  required>
+            <div id="set-folder-tier2_mirrored-response"></div>
+          </div>
+          <div>
+            <button class="btn btn-outline-secondary" type="button" id="set-values-button">Submit</button>
+          </div>
+        </dd>
 
-      <dt class="col-sm-4">Description</dt>
-      <dd class="col-sm-8">{{ object.description }}</dd>
+        <dt class="col-sm-4">Description</dt>
+        <dd class="col-sm-8">{{ object.description }}</dd>
 
-      <dt class="col-sm-4">Expiration</dt>
-      <dd class="col-sm-8">{{ object.expiration|date:"Y-m-d" }}</dd>
-    </dl>
-  </div>
-  <div class="col-sm-5">
+        <dt class="col-sm-4">Expiration</dt>
+        <dd class="col-sm-8">{{ object.expiration|date:"Y-m-d" }}</dd>
+      </dl>
+    </div>
+  {% endif %}
+  <div class="col{% if admin %}-sm-5{% endif %}">
     {% include "usersec/modules/comments.html" %}
   </div>
 </div>
diff --git a/usersec/templates/usersec/hpcgroupcreaterequest_form.html b/usersec/templates/usersec/hpcgroupcreaterequest_form.html
index b40efe3..d1d098d 100644
--- a/usersec/templates/usersec/hpcgroupcreaterequest_form.html
+++ b/usersec/templates/usersec/hpcgroupcreaterequest_form.html
@@ -4,146 +4,128 @@
 
 {% block content %}
 
-<h1 class="mt-5">
+<h2 class="mt-5">
   {% if update %}
-    Update group request
+    {% if admin %}
+      Request Revision
+    {% else %}
+      Update Group Request
+    {% endif %}
   {% else %}
-    Request group
+    Create Group Request
   {% endif %}
-</h1>
+</h2>
+
 {% if not admin %}
-  <p>
-    As the first step is for <strong>principal investigators and group leaders</strong> to create a <strong>group</strong> on the cluster which gives their group/lab members a primary entity on the cluster.
-  </p>
-  <p>
-    <strong>Only &quot;group leaders&quot; can do this.</strong>
-    Example of group leaders are principal investigators, leaders of scientific or technical units, and junior group leaders.
+  <p class="lead">
+    The first step for <strong>principal investigators and group leaders</strong> is to create a
+    <strong>group</strong> on the cluster.
+    <strong>Only &quot;group leaders&quot; can do this!</strong>
+    Example of group leaders are principal investigators, leaders of scientific or technical units,
+    and junior group leaders.
     As a group leader, you take responsibility for the action of your users on the cluster.
     Please provide a link to your group at Charite/MDC in the comment field for verification.
-  </p>
-  <p>
     You can add members to your groups and designate a delegate later on in the process.
   </p>
 {% endif %}
 
-  {% include "usersec/modules/comments.html" %}
+{% include "usersec/modules/comments.html" %}
 
-  <div class="container-fluid">
-    <form method="post" id="submit" data-is-admin="{{ admin }}">
-      {% csrf_token %}
-      {% if admin %}
-        <dl class="row" style="max-width: 50%;">
-          {% include "usersec/modules/resources_requested.html" with object=object %}
+<form method="post" class="mt-3 mb-3" id="submit" data-is-admin="{{ admin }}">
+  {% csrf_token %}
+  {% if admin %}
+    <dl class="row">
+      {% include "usersec/modules/resources_requested.html" with object=object %}
 
-          <dt class="col-sm-6">Requester</dt>
-          <dd class="col-sm-6">{{ object.requester.username }}</dd>
+      <dt class="col-sm-6">Requester</dt>
+      <dd class="col-sm-6">{{ object.requester.username }}</dd>
 
-          <dt class="col-sm-6">Description</dt>
-          <dd class="col-sm-6">{{ object.description }}</dd>
+      <dt class="col-sm-6">Description</dt>
+      <dd class="col-sm-6">{{ object.description }}</dd>
 
-          <dt class="col-sm-6">Expiration</dt>
-          <dd class="col-sm-6">{{ object.expiration|date:"Y-m-d" }}</dd>
-        </dl>
-      {% endif %}
+      <dt class="col-sm-6">Expiration</dt>
+      <dd class="col-sm-6">{{ object.expiration|date:"Y-m-d" }}</dd>
+    </dl>
+  {% endif %}
 
-      {% for field in form.hidden_fields %}
-        {{ field }}
-      {% endfor %}
+  {% for field in form.hidden_fields %}
+    {{ field }}
+  {% endfor %}
 
-      {% for field in form.visible_fields %}
-        <div class="fieldWrapper">
-          {% if field.errors %}
-            <div class="alert alert-danger" role="alert">
-              {{ field.errors }}
-            </div>
-          {% endif %}
-          <div class="input-group mb-3">
-            <span class="input-group-text">
-              {% if field.field.required %}
-                <strong>{{ field.label }}<sup class="text-danger">*</sup></strong>
-              {% else %}
-                {{ field.label }}
-              {% endif %}
+  {% if admin %}
+  <div class="d-none">
+  {% endif %}
+
+  {% include "usersec/form_field.html" with field=form.description %}
+
+  {% if not admin %}
+    <div class="fieldWrapper">
+      <div class="input-group mb-3">
+        <span class="input-group-text">
+          <input type="checkbox" class="form-check-input m-0" name="consent" id="id_i_am_pi">
+        </span>
+        <label for="id_i_am_pi">
+          <span class="form-control fw-bold">
+            I confirm that I am a group leader and provided some information/link in the comment field.<sup class="text-danger">*</sup>
+          </span>
+        </label>
+      </div>
+      <p class="help small text-muted fst-italic">
+        You must confirm that you are a group leader before you can submit the form.
+      </p>
+    </div>
+    {% if terms_list %}
+      <h3 class="mt-4">Terms &amp; Conditions</h3>
+      {% for obj in terms_list %}
+        <h4 class="mt-4">{{ obj.title }}</h4>
+        <p>{{ obj.text }}</p>
+        <div class="input-group mb-4">
+          <span class="input-group-text">
+            <input type="checkbox" class="form-check-input m-0 consent" name="consent{{ forloop.counter }}" id="id_consent{{ forloop.counter }}">
+          </span>
+          <label for="id_consent{{ forloop.counter }}">
+            <span class="form-control fw-bold">
+              I consent to <em>{{ obj.title }}</em>.
             </span>
-            {{ field }}
-          </div>
-          {% if field.help_text %}
-            <p class="help small text-muted fst-italic">{{ field.help_text|safe }}</p>
-          {% endif %}
+          </label>
         </div>
       {% endfor %}
+    {% endif %}
+  {% endif %}
+  {% if admin %}
+  </div>
+  {% endif %}
+
+  {% include "usersec/form_field.html" with field=form.comment %}
 
-      {% if not admin %}
-        <div class="fieldWrapper">
-          <div class="input-group mb-3">
-            <span class="input-group-text">
-              <input type="checkbox" class="form-check-input m-0" name="consent" id="id_i_am_pi">
-            </span>
-            <label for="id_i_am_pi">
-              <span class="form-control fw-bold">
-                I confirm that I am a group leader and provided some information/link in the comment field.<sup class="text-danger">*</sup>
-              </span>
-            </label>
-          </div>
-          <p class="help small text-muted fst-italic">
-            You must confirm that you are a group leader before you can submit the form.
-          </p>
-        </div>
-        <h3 class="mt-4">Terms &amp; Conditions</h3>
-        {% for obj in terms_list %}
-          <h4 class="mt-4">{{ obj.title }}</h4>
-          <p>{{ obj.text }}</p>
-          <div class="input-group mb-4">
-            <span class="input-group-text">
-              <input type="checkbox" class="form-check-input m-0 consent" name="consent{{ forloop.counter }}" id="id_consent{{ forloop.counter }}">
-            </span>
-            <label for="id_consent{{ forloop.counter }}">
-              <span class="form-control fw-bold">
-                I consent to <em>{{ obj.title }}</em>.
-              </span>
-            </label>
-          </div>
-        {% endfor %}
-      {% endif %}
 
-      {% if update %}
-        <a class="btn btn-secondary"
-          {% if admin %}
-           href="{% url 'adminsec:hpcgroupcreaterequest-detail' hpcgroupcreaterequest=object.uuid %}"
-          {% else %}
-           href="{% url 'usersec:hpcgroupcreaterequest-detail' hpcgroupcreaterequest=object.uuid %}"
-          {% endif %}
-        >
-          <i class="iconify" data-icon="mdi:arrow-left-bold"></i>
-          Cancel
-        </a>
+  {% if admin or update %}
+    <a class="btn btn-secondary"
+      {% if admin %}
+        href="{% url 'adminsec:hpcgroupcreaterequest-detail' hpcgroupcreaterequest=object.uuid %}"
       {% else %}
-        <a class="btn btn-secondary"
-          href="{% url 'home' %}"
-        >
-          <i class="iconify" data-icon="mdi:arrow-left-bold"></i>
-          Cancel
-        </a>
+        href="{% url 'usersec:hpcgroupcreaterequest-detail' hpcgroupcreaterequest=object.uuid %}"
       {% endif %}
-      <button class="btn btn-primary {% if not admin %}disabled{% endif %}" type="submit" id="id_submit_button">
-        {% if update %}
-          {% if admin %}
-            <i class="iconify" data-icon="mdi:comment"></i>
-            Request Revision
-          {% else %}
-            <i class="iconify" data-icon="mdi:refresh"></i>
-            Update
-          {% endif %}
-        {% else %}
-          <i class="iconify" data-icon="mdi:upload"></i>
-          Submit
-        {% endif %}
-      </button>
-    </form>
-  </div>
+    >
+      Cancel
+    </a>
+  {% endif %}
+  <button class="btn btn-primary {% if not admin %}disabled{% endif %}" type="submit" id="id_submit_button">
+    {% if update %}
+      {% if admin %}
+        Request Revision
+      {% else %}
+        Update
+      {% endif %}
+    {% else %}
+      Submit
+    {% endif %}
+  </button>
+</form>
 {% endblock content %}
 
 {% block inline_javascript %}
+  {% if not admin %} 
   {{ block.super }}
   <script>
     function consents() {
@@ -165,4 +147,5 @@ <h4 class="mt-4">{{ obj.title }}</h4>
       consents();
     });
   </script>
+  {% endif %}
 {% endblock inline_javascript %}
diff --git a/usersec/templates/usersec/hpcprojectchangerequest_detail.html b/usersec/templates/usersec/hpcprojectchangerequest_detail.html
index e2f26d9..2bb6f12 100644
--- a/usersec/templates/usersec/hpcprojectchangerequest_detail.html
+++ b/usersec/templates/usersec/hpcprojectchangerequest_detail.html
@@ -4,63 +4,65 @@
 
 {% block content %}
 
-  <div class="card mt-5">
-    <div class="card-header">
-      <h4 class="card-title">
-        HPC Project Change Request
-        <span class="badge bg-{{ object.status|colorize_request_status }}">
-          {{ object.display_status }}
-        </span>
-        <span class="float-end">
-          {% if admin %}
-            {% include "usersec/modules/request_buttons_admin.html" %}
-          {% else %}
-            {% include "usersec/modules/request_buttons_user.html" %}
-          {% endif %}
-        </span>
-      </h4>
-    </div>
-    <div class="card-body">
-      <div class="row">
-        <div class="col-sm-6">
-          <dl class="row">
-            {% include "usersec/modules/resources_requested.html" with object=object %}
+<h2 class="mt-5">
+  Request Project
+  <span class="float-end">
+    {% if admin %}
+      {% include "usersec/modules/request_buttons_admin.html" %}
+    {% else %}
+      {% include "usersec/modules/request_buttons_user.html" %}
+    {% endif %}
+  </span>
+</h2>
 
-            <dt class="col-sm-6">Requester</dt>
-            <dd class="col-sm-6">
-              <a href="{{ object.requester.hpcuser_user.first|get_detail_url:user }}">{{ object.requester.name }}</a>
-              <strong class="small text-muted">{{ object.requester.hpcuser_user.first.username }}</strong>
-            </dd>
+<div class="row mt-4">
+  <div class="col-sm-7">
+    <dl class="row">    
+      {% include "usersec/modules/resources_requested.html" with object=object %}
 
-            <dt class="col-sm-6">Delegate</dt>
-            <dd class="col-sm-6">
-              {% if object.delegate %}
-                <a href="{{ object.delegate|get_detail_url:user }}">{{ object.delegate.user.name }}</a> <strong class="small text-muted">{{ object.delegate.username }}</strong>
-              {% else %}
-                <em class="text-muted">No delegate.</em>
-              {% endif %}
-            </dd>
+      {% if admin %}
+      <dt class="col-sm-6">Requester</dt>
+      <dd class="col-sm-6">
+        {{ object.requester.name }}
+        <span class="small fw-light">({{ object.requester.hpcuser_user.first.username }})</span>
+      </dd>
 
-            <dt class="col-sm-6">Members</dt>
-            <dd class="col-sm-6">
-              <ul class="list-unstyled">
-                {% for member in object.members.all %}
-                  <li>
-                    <a href="{{ member|get_detail_url:user }}">{{ member.user.name }}</a> <strong class="small text-muted">{{ member.username }}</strong>
-                  </li>
-                {% endfor %}
-              </ul>
-            </dd>
+      <dt class="col-sm-6">Associated Group</dt>
+      <dd class="col-sm-6">
+        AG {{ object.project.group.name.capitalize }}
+        &mdash; {{ object.project.group.owner.user.name }}
+        <span class="fw-light">({{ object.project.group.owner.username }})</span>
+      </dd>
+      {% endif %}
 
-            <dt class="col-sm-6">Expiration</dt>
-            <dd class="col-sm-6">{{ object.expiration|date:"Y-m-d" }}</dd>
-          </dl>
-        </div>
-        <div class="col-sm-6">
-          {% include "usersec/modules/comments.html" %}
-        </div>
-      </div>
-    </div>
+      <dt class="col-sm-6">Delegate</dt>
+      <dd class="col-sm-6">
+        {% if object.delegate %}
+          {{ object.delegate.user.name }}
+          <span class="fw-light">({{ object.delegate.username }}, AG {{ object.delegate.primary_group.name }})</span>
+        {% else %}
+          <em class="text-muted">No delegate.</em>
+        {% endif %}
+      </dd>
+
+      <dt class="col-sm-6">Members</dt>
+      <dd class="col-sm-6">
+        <ul class="list-unstyled">
+          {% for member in object.members.all %}
+            <li>
+              {{ member.user.name }} <span class="fw-light">({{ member.username }}, AG {{ member.primary_group.name }})</span>
+            </li>
+          {% endfor %}
+        </ul>
+      </dd>
+
+      <dt class="col-sm-6">Expiration</dt>
+      <dd class="col-sm-6">{{ object.expiration|date:"Y-m-d" }}</dd>
+    </dl>
+  </div>
+  <div class="col-sm-5">
+    {% include "usersec/modules/comments.html" %}
   </div>
+</div>
 
 {% endblock content %}
diff --git a/usersec/templates/usersec/hpcprojectchangerequest_form.html b/usersec/templates/usersec/hpcprojectchangerequest_form.html
deleted file mode 100644
index 02142bb..0000000
--- a/usersec/templates/usersec/hpcprojectchangerequest_form.html
+++ /dev/null
@@ -1,150 +0,0 @@
-{% extends 'base.html' %}
-
-{% load crispy_forms_tags %}
-{% load common %}
-
-{% block content %}
-
-  <div class="row">
-    <h2>
-      {% if update %}
-        Update Project Change Request &mdash; {{ project.name }} ({{ project.group.owner.user.name }})
-      {% else %}
-        Request Project Change &mdash; {{ project.name }} ({{ project.group.owner.user.name }})
-      {% endif %}
-    </h2>
-  </div>
-
-  {% include "usersec/modules/comments.html" %}
-
-  <div class="container-fluid">
-    <form method="post" id="submit" data-is-admin="{{ admin }}" data-owner-id="{{ project.group.owner.id }}">
-      {% csrf_token %}
-      {% if admin %}
-        <dl class="row">
-          <dt class="col-sm-3">Resource Quotas</dt>
-          <dd class="col-sm-9">
-            <dl class="row">
-              {% for key, value in object.resources_requested.items %}
-                <dt class="col-sm-3 text-muted">{{ key }}</dt>
-                <dd class="col-sm-9">{{ value }}</dd>
-              {% endfor %}
-            </dl>
-          </dd>
-
-          <dt class="col-sm-3">Requester</dt>
-          <dd class="col-sm-9">{{ object.requester.username }}</dd>
-
-          <dt class="col-sm-3">Description</dt>
-          <dd class="col-sm-9">{{ object.description }}</dd>
-
-          <dt class="col-sm-3">Members <span class="badge rounded-pill bg-secondary">{{ object.members.count }}</span></dt>
-          <dd class="col-sm-9">
-            <ul class="list-unstyled">
-              {% for member in object.members.all %}
-                <li>{{ member }}</li>
-              {% endfor %}
-            </ul>
-          </dd>
-
-          <dt class="col-sm-3">Expiration</dt>
-          <dd class="col-sm-9">{{ object.expiration|date:"Y-m-d" }}</dd>
-        </dl>
-      {% endif %}
-
-      {% for field in form.hidden_fields %}
-        {{ field }}
-      {% endfor %}
-
-      {% for field in form.visible_fields %}
-        <div class="fieldWrapper {% if field.label == "Members" %}d-none{% endif %}">
-          {% if field.errors %}
-            <div class="alert alert-danger" role="alert">
-              {{ field.errors }}
-            </div>
-          {% endif %}
-          <div class="input-group mb-3">
-            <span class="input-group-text">
-              {% if field.field.required %}
-                <strong>{{ field.label }}<sup class="text-danger">*</sup></strong>
-              {% else %}
-                {{ field.label }}
-              {% endif %}
-            </span>
-            {{ field }}
-            {% if field.label == "Select Members" %}
-              <button class="btn btn-secondary" type="button" id="addMember">
-                Add
-              </button>
-            {% endif %}
-          </div>
-          {% if field.help_text %}
-            <p class="help small text-muted fst-italic">{{ field.help_text|safe }}</p>
-          {% endif %}
-          {% if field.label == "Select Members" %}
-            <h6>Members selected</h6>
-            <div class="mb-4" id="membersSelected">
-              <em class="text-danger fst-italic">No members selected.</em>
-            </div>
-          {% endif %}
-        </div>
-      {% endfor %}
-
-      {% if update %}
-        <a class="btn btn-secondary"
-          {% if admin %}
-           href="{% url 'adminsec:hpcprojectchangerequest-detail' hpcprojectchangerequest=object.uuid %}"
-          {% else %}
-           href="{% url 'usersec:hpcprojectchangerequest-detail' hpcprojectchangerequest=object.uuid %}"
-          {% endif %}
-        >
-          <i class="iconify" data-icon="mdi:arrow-left-bold"></i>
-          Cancel
-        </a>
-      {% else %}
-        <a class="btn btn-secondary"
-          href="{% url 'home' %}"
-        >
-          <i class="iconify" data-icon="mdi:arrow-left-bold"></i>
-          Cancel
-        </a>
-      {% endif %}
-      <button class="btn btn-primary" type="submit">
-        {% if update %}
-          {% if admin %}
-            <i class="iconify" data-icon="mdi:comment"></i>
-            Request Revision
-          {% else %}
-            <i class="iconify" data-icon="mdi:refresh"></i>
-            Update
-          {% endif %}
-        {% else %}
-          <i class="iconify" data-icon="mdi:upload"></i>
-          Submit
-        {% endif %}
-      </button>
-    </form>
-  </div>
-{% endblock content %}
-
-{% block inline_javascript %}
-  {{ block.super }}
-  <script>
-    $(document).ready(function() {
-      $("#addMember").click(addMember)
-      $(".mergeToJson").change(mergeToJson);
-      $("#id_delegate").change(addDelegateMember);
-
-      addOwnerMember();
-      addDelegateMember();
-      buildSelectedMembers();
-      jsonToFields();
-
-      $("#submit").submit(function(event) {
-        if (!$(this).data("is-admin")) {
-          mergeToJson();
-        }
-      });
-    });
-  </script>
-{% endblock inline_javascript %}
diff --git a/usersec/templates/usersec/hpcprojectchangerequest_retract_confirm.html b/usersec/templates/usersec/hpcprojectchangerequest_retract_confirm.html
deleted file mode 100644
index b886279..0000000
--- a/usersec/templates/usersec/hpcprojectchangerequest_retract_confirm.html
+++ /dev/null
@@ -1,9 +0,0 @@
-{% extends 'base.html' %}
-
-{% load common %}
-
-{% block content %}
-
-  {% include "usersec/modules/confirm.html" with action="Retract" object_type="request to change a project" %}
-
-{% endblock content %}
diff --git a/usersec/templates/usersec/hpcprojectcreaterequest_detail.html b/usersec/templates/usersec/hpcprojectcreaterequest_detail.html
index 7989e1d..347b666 100644
--- a/usersec/templates/usersec/hpcprojectcreaterequest_detail.html
+++ b/usersec/templates/usersec/hpcprojectcreaterequest_detail.html
@@ -5,7 +5,7 @@
 {% block content %}
 
 <h2 class="mt-5">
-  Request to Create a Project
+  Request Project
   <span class="float-end">
     {% if admin %}
       {% include "usersec/modules/request_buttons_admin.html" %}
@@ -25,21 +25,10 @@ <h2 class="mt-5">
     </ul>
   </div>
 </div>
+{% else %}
+  {% include "usersec/modules/request_status_card.html" %}
 {% endif %}
-{% if not admin %}
-<div class="mt-4 card bg-{{ object.status|colorize_request_status }}">
-  <div class="card-body lead text-light">
-    {% if object.status == "ACTIVE" %}
-      You've requested a new project with the name <strong>{{ object.name_requested }}</strong>.
-      We are working on your request and you will receive an email once we approve it.
-    {% elif object.status == "RETRACTED" %}
-      You have retracted your request to create a project. Click <strong>Re-activate</strong> to activate the request.
-    {% elif object.status == "REVISION" %}
-      We have asked for you to revise your request to create a project. See our comment and please answer any question.
-    {% endif %}
-  </div>
-</div>
-{% endif %}
+
 <div class="row mt-4">
   <div class="col-sm-7">
     <dl class="row">    
@@ -154,7 +143,7 @@ <h6 class="mt-3"><strong>Tier 2</strong></h6>
       <dd class="col-sm-6">
         {% if object.delegate %}
           {{ object.delegate.user.name }}
-          <span class="fw-light">({{ object.delegate.username }})</span>
+          <span class="fw-light">({{ object.delegate.username }}, AG {{ object.delegate.primary_group.name }})</span>
         {% else %}
           <em class="text-muted">No delegate.</em>
         {% endif %}
@@ -179,10 +168,10 @@ <h6 class="mt-3"><strong>Tier 2</strong></h6>
     {% include "usersec/modules/comments.html" %}
   </div>
 </div>
-</div>
 {% endblock content %}
 
 {% block inline_javascript %}
+  {% if admin %}
   <script type="text/javascript">
     function getCookie(name) {
       let cookieValue = null;
@@ -281,4 +270,5 @@ <h6 class="mt-3"><strong>Tier 2</strong></h6>
       });
     })
   </script>
+  {% endif %}
 {% endblock inline_javascript %}
diff --git a/usersec/templates/usersec/hpcprojectcreaterequest_form.html b/usersec/templates/usersec/hpcprojectcreaterequest_form.html
index a58e992..cea646e 100644
--- a/usersec/templates/usersec/hpcprojectcreaterequest_form.html
+++ b/usersec/templates/usersec/hpcprojectcreaterequest_form.html
@@ -7,15 +7,19 @@
 
   <h2 class="mt-5">
     {% if update %}
-      Update Project Request
+      {% if admin %}
+        Request Revision
+      {% else %}
+        Update Project Request
+      {% endif %}
     {% else %}
-      Request Project
+      Create Project Request
     {% endif %}
   </h2>
 
   {% include "usersec/modules/comments.html" %}
 
-  <form method="post" class="mt-3 mb-3" id="submit" data-is-admin="{{ admin }}" data-owner-id="{% if group %}{{ group.owner.id }}{% else %}{{ object.group.owner.id }}{% endif %}">
+  <form method="post" class="mt-3 mb-3" id="submit" data-is-admin="{{ admin }}" data-owner-id="{{ owner_id }}">
     {% csrf_token %}
     {% if admin %}
       <dl class="row">
@@ -45,64 +49,56 @@ <h2 class="mt-5">
       {{ field }}
     {% endfor %}
 
-    {{ form.members }}
+    {% if admin %}
+    <div class="d-none">
+    {% endif %}
+      {{ form.members }}
 
-    {% include "usersec/form_field.html" with field=form.name_requested %}
-    {% include "usersec/form_field.html" with field=form.description %}
-    {% include "usersec/form_field.html" with field=form.expiration %}
+      {% include "usersec/form_field.html" with field=form.name_requested %}
+      {% include "usersec/form_field.html" with field=form.description %}
+      {% include "usersec/form_field.html" with field=form.expiration %}
 
-    {{ form.delegate }}
+      <h4 class="mt-4">Delegate</h4>
 
-    <h4 class="mt-4">Members</h4>
+      {{ form.delegate }}
 
-    <ul class="mt-2 mb-3 list-group list-group-numbered" id="membersSelected">
-    </ul>
-    <div class="fieldWrapper">
-      <input type="text" id="typeahead" class="typeahead form-control" placeholder="Search user ...">
-    </div>
+      <h4 class="mt-4">Members</h4>
 
-    <h4 class="mt-4">Resources</h4>
-
-    <div class="row mt-3">
-      <div class="col-md-6">
-        <h5>Tier 1</h5>
-        {% include "usersec/form_field.html" with field=form.tier1_scratch %}
-      </div>
-      <div class="col-md-6">
-        <h5>Tier 2</h5>
-        {% include "usersec/form_field.html" with field=form.tier2_unmirrored %}
+      <ul class="mt-2 mb-3 list-group list-group-numbered" id="membersSelected">
+      </ul>
+      <div class="fieldWrapper">
+        <input type="text" id="typeahead" class="typeahead form-control" placeholder="Search user ...">
       </div>
-    </div>
-    <div class="row">
-      <div class="col-md-6">
-        {% include "usersec/form_field.html" with field=form.tier1_work %}
+
+      <h4 class="mt-4">Resources</h4>
+
+      <div class="row mt-3">
+        <div class="col-md-6">
+          <h5>Tier 1</h5>
+          {% include "usersec/form_field.html" with field=form.tier1_scratch %}
+        </div>
+        <div class="col-md-6">
+          <h5>Tier 2</h5>
+          {% include "usersec/form_field.html" with field=form.tier2_unmirrored %}
+        </div>
       </div>
-      <div class="col-md-6">
-        {% include "usersec/form_field.html" with field=form.tier2_mirrored %}
+      <div class="row">
+        <div class="col-md-6">
+          {% include "usersec/form_field.html" with field=form.tier1_work %}
+        </div>
+        <div class="col-md-6">
+          {% include "usersec/form_field.html" with field=form.tier2_mirrored %}
+        </div>
       </div>
+    {% if admin %}
     </div>
-
-    <h4 class="mt-4">Comment for the HPC Team</h4>
+    {% endif %}
 
     {% include "usersec/form_field.html" with field=form.comment %}
 
-    {% if update %}
-      <a class="btn btn-secondary"
-        {% if admin %}
-          href="{% url 'adminsec:hpcprojectcreaterequest-detail' hpcprojectcreaterequest=object.uuid %}"
-        {% else %}
-          href="{% url 'usersec:hpcprojectcreaterequest-detail' hpcprojectcreaterequest=object.uuid %}"
-        {% endif %}
-      >
-        Cancel
-      </a>
-    {% else %}
-      <a class="btn btn-secondary"
-        href="{% url 'home' %}"
-      >
-        Cancel
-      </a>
-    {% endif %}
+    <a class="btn btn-secondary" href="{% url 'home' %}">
+      Cancel
+    </a>
     <button class="btn btn-primary" type="submit">
       {% if update %}
         {% if admin %}
diff --git a/usersec/templates/usersec/hpcuserchangerequest_detail.html b/usersec/templates/usersec/hpcuserchangerequest_detail.html
index 8ebce39..7b1ad2c 100644
--- a/usersec/templates/usersec/hpcuserchangerequest_detail.html
+++ b/usersec/templates/usersec/hpcuserchangerequest_detail.html
@@ -4,41 +4,35 @@
 
 {% block content %}
 
-  <div class="card mt-5">
-    <div class="card-header">
-      <h4 class="card-title">
-        HPC User Change Request
-        <span class="badge bg-{{ object.status|colorize_request_status }}">
-          {{ object.display_status }}
-        </span>
-        <span class="float-end">
-          {% if admin %}
-            {% include "usersec/modules/request_buttons_admin.html" %}
-          {% else %}
-            {% include "usersec/modules/request_buttons_user.html" %}
-          {% endif %}
-        </span>
-      </h4>
-    </div>
-    <div class="card-body">
-      <div class="row">
-        <div class="col-sm-6">
-          <dl class="row">
-            <dt class="col-sm-3">User</dt>
-            <dd class="col-sm-9">{{ object.user }}</dd>
+<h2 class="mt-5">
+  Extend User Expiration
+  <span class="float-end">
+    {% if admin %}
+      {% include "usersec/modules/request_buttons_admin.html" %}
+    {% else %}
+      {% include "usersec/modules/request_buttons_user.html" %}
+    {% endif %}
+  </span>
+</h2>
 
-            <dt class="col-sm-3">Requester</dt>
-            <dd class="col-sm-9">{{ object.requester }}</dd>
+<div class="row mt-4">
+  <div class="col-sm-7">
+    <dl class="row">    
+      {% if admin %}
+      <dt class="col-sm-6">Requester</dt>
+      <dd class="col-sm-6">{{ object.requester }}</dd>
+      {% endif %}
 
-            <dt class="col-sm-3">Expiration</dt>
-            <dd class="col-sm-9">{{ object.expiration|date:"Y-m-d" }}</dd>
-          </dl>
-        </div>
-        <div class="col-sm-6">
-          {% include "usersec/modules/comments.html" %}
-        </div>
-      </div>
-    </div>
+      <dt class="col-sm-6">User</dt>
+      <dd class="col-sm-6">{{ object.user }}</dd>
+
+      <dt class="col-sm-6">Expiration</dt>
+      <dd class="col-sm-6">{{ object.expiration|date:"Y-m-d" }}</dd>
+    </dl>
+  </div>
+  <div class="col-sm-5">
+    {% include "usersec/modules/comments.html" %}
   </div>
+</div>
 
 {% endblock content %}
diff --git a/usersec/templates/usersec/hpcuserchangerequest_form.html b/usersec/templates/usersec/hpcuserchangerequest_form.html
index 7b16325..4f712e5 100644
--- a/usersec/templates/usersec/hpcuserchangerequest_form.html
+++ b/usersec/templates/usersec/hpcuserchangerequest_form.html
@@ -4,96 +4,75 @@
 
 {% block content %}
 
-  <div class="row">
-    <h2>
-      {% if update %}
-        Update User Change Request
-      {% else %}
-        Request User Change
-      {% endif %}
-    </h2>
-  </div>
+<h2 class="mt-5">
+  {% if update %}
+    {% if admin %}
+      Request Revision
+    {% else %}
+      Update User Change Request
+    {% endif %}
+  {% else %}
+    Create User Change Request
+  {% endif %}
+  &mdash;
+  <span class="fw-light">{{ user }}</span>
+</h2>
 
-  <div class="alert alert-warning">
-    Change request is for user <strong>{{ user }}</strong>
-  </div>
+{% include "usersec/modules/comments.html" %}
 
-  {% include "usersec/modules/comments.html" %}
-
-  <div class="container-fluid">
-    <form method="post" id="submit" data-is-admin="{{ admin }}">
-      {% csrf_token %}
-      {% if admin %}
-        <dl class="row">
-          <dt class="col-sm-3">Requester</dt>
-          <dd class="col-sm-9">{{ object.requester.username }}</dd>
+<form method="post" class="mt-3 mb-3" id="submit" data-is-admin="{{ admin }}">
+  {% csrf_token %}
+  {% if admin %}
+    <dl class="row">
+      <dt class="col-sm-3">Requester</dt>
+      <dd class="col-sm-9">{{ object.requester.username }}</dd>
 
-          <dt class="col-sm-3">Expiration</dt>
-          <dd class="col-sm-9">{{ object.expiration|date:"Y-m-d" }}</dd>
-        </dl>
-      {% endif %}
+      <dt class="col-sm-3">Expiration</dt>
+      <dd class="col-sm-9">{{ object.expiration|date:"Y-m-d" }}</dd>
+    </dl>
+  {% endif %}
 
-      {% for field in form.hidden_fields %}
-        {{ field }}
-      {% endfor %}
+  {% for field in form.hidden_fields %}
+    {{ field }}
+  {% endfor %}
 
-      {% for field in form.visible_fields %}
-        <div class="fieldWrapper">
-          {% if field.errors %}
-            <div class="alert alert-danger" role="alert">
-              {{ field.errors }}
-            </div>
-          {% endif %}
-          <div class="input-group mb-3">
-            <span class="input-group-text">
-              {% if field.field.required %}
-                <strong>{{ field.label }}<sup class="text-danger">*</sup></strong>
-              {% else %}
-                {{ field.label }}
-              {% endif %}
-            </span>
-            {{ field }}
-          </div>
-          {% if field.help_text %}
-            <p class="help small text-muted fst-italic">{{ field.help_text|safe }}</p>
-          {% endif %}
+  {% for field in form.visible_fields %}
+    <div class="fieldWrapper">
+      {% if field.errors %}
+        <div class="alert alert-danger" role="alert">
+          {{ field.errors }}
         </div>
-      {% endfor %}
-
-      {% if update %}
-        <a class="btn btn-secondary"
-          {% if admin %}
-           href="{% url 'adminsec:hpcuserchangerequest-detail' hpcuserchangerequest=object.uuid %}"
+      {% endif %}
+      <div class="input-group mb-3">
+        <span class="input-group-text">
+          {% if field.field.required %}
+            <strong>{{ field.label }}<sup class="text-danger">*</sup></strong>
           {% else %}
-           href="{% url 'usersec:hpcuserchangerequest-detail' hpcuserchangerequest=object.uuid %}"
+            {{ field.label }}
           {% endif %}
-        >
-          <i class="iconify" data-icon="mdi:arrow-left-bold"></i>
-          Cancel
-        </a>
+        </span>
+        {{ field }}
+      </div>
+      {% if field.help_text %}
+        <p class="help small text-muted fst-italic">{{ field.help_text|safe }}</p>
+      {% endif %}
+    </div>
+  {% endfor %}
+
+  <a class="btn btn-secondary" href="{% url 'home' %}">
+    Cancel
+  </a>
+  <button class="btn btn-primary" type="submit">
+    {% if update %}
+      {% if admin %}
+        Request Revision
       {% else %}
-        <a class="btn btn-secondary"
-          href="{% url 'home' %}"
-        >
-          <i class="iconify" data-icon="mdi:arrow-left-bold"></i>
-          Cancel
-        </a>
+        Update
       {% endif %}
-      <button class="btn btn-primary" type="submit">
-        {% if update %}
-          {% if admin %}
-            <i class="iconify" data-icon="mdi:comment"></i>
-            Request Revision
-          {% else %}
-            <i class="iconify" data-icon="mdi:refresh"></i>
-            Update
-          {% endif %}
-        {% else %}
-          <i class="iconify" data-icon="mdi:upload"></i>
-          Submit
-        {% endif %}
-      </button>
-    </form>
-  </div>
+    {% else %}
+      Submit
+    {% endif %}
+  </button>
+</form>
 
 {% endblock content %}
diff --git a/usersec/templates/usersec/hpcusercreaterequest_detail.html b/usersec/templates/usersec/hpcusercreaterequest_detail.html
index 00b779a..6e16298 100644
--- a/usersec/templates/usersec/hpcusercreaterequest_detail.html
+++ b/usersec/templates/usersec/hpcusercreaterequest_detail.html
@@ -18,41 +18,27 @@ <h2 class="mt-5">
 <div class="row mt-4">
   <div class="col-sm-6">
     {% if admin %}
-    <dl class="row">
-      <dt class="col-sm-3">Status</dt>
-        <dd class="col-sm-9"><span class="badge bg-{{ object.status|colorize_request_status }}">
-          {{ object.display_status }}
-        </span>
-      </dd>
-    
-      <dt class="col-sm-3">Invitee</dt>
-      <dd class="col-sm-9">{{ object.email }}</dd>
-
-      <dt class="col-sm-3">Requester</dt>
-      <dd class="col-sm-9">{{ object.requester }}</dd>
-
-      <dt class="col-sm-3">Group</dt>
-      <dd class="col-sm-9">{{ object.group.name }}</dd>
-
-      <dt class="col-sm-3">Expiration</dt>
-      <dd class="col-sm-9">{{ object.expiration|date:"Y-m-d" }}</dd>
-    </dl>
+      <dl class="row">
+        <dt class="col-sm-3">Status</dt>
+          <dd class="col-sm-9"><span class="badge bg-{{ object.status|colorize_request_status }}">
+            {{ object.display_status }}
+          </span>
+        </dd>
+      
+        <dt class="col-sm-3">Invitee</dt>
+        <dd class="col-sm-9">{{ object.email }}</dd>
+
+        <dt class="col-sm-3">Requester</dt>
+        <dd class="col-sm-9">{{ object.requester }}</dd>
+
+        <dt class="col-sm-3">Group</dt>
+        <dd class="col-sm-9">{{ object.group.name }}</dd>
+
+        <dt class="col-sm-3">Expiration</dt>
+        <dd class="col-sm-9">{{ object.expiration|date:"Y-m-d" }}</dd>
+      </dl>
     {% else %}
-    <div class="card bg-{{ object.status|colorize_request_status }}">
-      <div class="card-body lead text-light">
-        {% if object.status == "ACTIVE" %}
-          You've invited the user <strong>{{ object.email }}</strong> to your group.
-          We are working on your request and you will receive an email once we approve it.
-        {% elif object.status == "RETRACTED" %}
-          You have retracted your request to invite <strong class="text-nowrap">{{ object.email }}</strong> to your
-          group. Click <strong>Re-activate</strong> to re-activate the request for invitation.
-        {% elif object.status == "REVISION" %}
-          We have asked for you to revise your request to invite
-          <strong>{{ object.email }}</strong> to your group. See our comment and please answer any
-          question.
-        {% endif %}
-      </div>
-    </div>
+      {% include "usersec/modules/request_detail.html" %}
   {% endif %}
   </div>
   <div class="col-sm-6">
diff --git a/usersec/templates/usersec/hpcusercreaterequest_form.html b/usersec/templates/usersec/hpcusercreaterequest_form.html
index 5582f12..51610a2 100644
--- a/usersec/templates/usersec/hpcusercreaterequest_form.html
+++ b/usersec/templates/usersec/hpcusercreaterequest_form.html
@@ -6,9 +6,9 @@
 
   <h2 class="mt-5">
     {% if update %}
-      Update User Request
+      Update User Invitation
     {% else %}
-      Request User
+      Invite User
     {% endif %}
   </h2>
 
@@ -50,28 +50,9 @@ <h2 class="mt-5">
       {{ field }}
     {% endfor %}
 
-    {% for field in form.visible_fields %}
-      <div class="fieldWrapper">
-        {% if field.errors %}
-          <div class="alert alert-danger" role="alert">
-            {{ field.errors }}
-          </div>
-        {% endif %}
-        <div class="input-group mb-3">
-          <span class="input-group-text">
-            {% if field.field.required %}
-              <strong>{{ field.label }}<sup class="text-danger">*</sup></strong>
-            {% else %}
-              {{ field.label }}
-            {% endif %}
-          </span>
-          {{ field }}
-        </div>
-        {% if field.help_text %}
-          <p class="help small text-muted fst-italic">{{ field.help_text|safe }}</p>
-        {% endif %}
-      </div>
-    {% endfor %}
+    {% include "usersec/form_field.html" with field=form.email %}
+    {% include "usersec/form_field.html" with field=form.expiration %}
+    {% include "usersec/form_field.html" with field=form.comment %}
 
     {% if update %}
       <a class="btn btn-secondary"
@@ -88,21 +69,17 @@ <h2 class="mt-5">
       <a class="btn btn-secondary"
           href="{% url 'home' %}"
       >
-        <i class="iconify" data-icon="mdi:arrow-left-bold"></i>
         Cancel
       </a>
     {% endif %}
     <button class="btn btn-primary" type="submit">
       {% if update %}
         {% if admin %}
-          <i class="iconify" data-icon="mdi:comment"></i>
           Request Revision
         {% else %}
-          <i class="iconify" data-icon="mdi:refresh"></i>
           Update
         {% endif %}
       {% else %}
-        <i class="iconify" data-icon="mdi:upload"></i>
         Submit
       {% endif %}
     </button>
diff --git a/usersec/templates/usersec/modules/comments.html b/usersec/templates/usersec/modules/comments.html
index 5332af7..7f62f83 100644
--- a/usersec/templates/usersec/modules/comments.html
+++ b/usersec/templates/usersec/modules/comments.html
@@ -1,5 +1,4 @@
-{% if object.get_comment_history %}
-<div class="card bg-light mb-3">
+<div class="card bg-light mb-4">
   <h5 class="card-header">Comments</h5>
   <div class="card-body">
     <ul class="card-text list-unstyled">
@@ -11,8 +10,9 @@ <h5 class="card-header">Comments</h5>
           </span>
           {{ comment.2 }}
         </li>
+      {% empty %}
+        <li class="text-muted">No comments.</li>
       {% endfor %}
     </ul>
   </div>
 </div>
-{% endif %}
diff --git a/usersec/templates/usersec/modules/confirm.html b/usersec/templates/usersec/modules/confirm.html
index b0b5e8a..d8f62ed 100644
--- a/usersec/templates/usersec/modules/confirm.html
+++ b/usersec/templates/usersec/modules/confirm.html
@@ -11,7 +11,6 @@ <h2 class="mt-5">
     </strong>
     the {{ object_type }}?
   </p>
-  {{ form }}
   <a class="btn btn-secondary" onclick="history.back()">
     <i class="iconify" data-icon="mdi:arrow-left-bold"></i>
     Cancel
diff --git a/usersec/templates/usersec/modules/manage.html b/usersec/templates/usersec/modules/manage.html
index fee36c1..3829f86 100644
--- a/usersec/templates/usersec/modules/manage.html
+++ b/usersec/templates/usersec/modules/manage.html
@@ -1,160 +1,177 @@
 {% load common %}
 
-<div class="row mb-4">
-  {% if pending_requests %}
-    <div class="col-{% if revision_requests and retracted_requests %}4{% elif revision_requests or retracted_requests %}6{% else %}12{% endif %}">
-      <div class="card bg-info">
-        <div class="card-header">
-          <h5 class="card-title lead">
-            Pending Requests
-          </h5>
-        </div>
-        <ul class="list-group list-group-flush">
-          {% for obj in pending_requests %}
-            <li class="list-group-item bg-info">
-              <a class="btn btn-light" href="{{ obj|get_detail_url:user }}">
-                <span class="badge bg-dark">{{ obj.get_request_type }}</span>
-                <span class="small">
-                  issued on {{ obj.date_created|date:"Y-m-d H:i" }}
-                  last modified on {{ obj.date_modified|date:"Y-m-d H:i" }}
-                </span>
-              </a>
-            </li>
-          {% endfor %}
-        </ul>
-      </div>
-    </div>
-  {% endif %}
-  {% if revision_requests %}
-    <div class="col-{% if pending_requests and retracted_requests %}4{% elif pending_requests or retracted_requests %}6{% else %}12{% endif %}">
-      <div class="card bg-warning">
-        <div class="card-header">
-          <h5 class="card-title lead">
-            Requests That Require Revision
-          </h5>
-        </div>
-        <ul class="list-group list-group-flush">
-          {% for obj in revision_requests %}
-            <li class="list-group-item bg-warning">
-              <a class="btn btn-light" href="{{ obj|get_detail_url:user }}">
-                <span class="badge bg-dark">{{ obj.get_request_type }}</span>
-                <span class="small">
-                  issued on {{ obj.date_created|date:"Y-m-d H:i" }},
-                  last modified on {{ obj.date_modified|date:"Y-m-d H:i" }}
-                </span>
-              </a>
-            </li>
-          {% endfor %}
-        </ul>
-      </div>
-    </div>
-  {% endif %}
-  {% if retracted_requests %}
-    <div class="col-{% if revision_requests and pending_requests %}4{% elif revision_requests or pending_requests %}6{% else %}12{% endif %}">
-      <div class="card bg-secondary text-light">
-        <div class="card-header">
-          <h5 class="card-title lead">
-            Requests That Have Been Retracted
-          </h5>
-        </div>
-        <ul class="list-group list-group-flush">
-          {% for obj in retracted_requests %}
-            <li class="list-group-item bg-secondary">
-              <a class="btn btn-light" href="{{ obj|get_detail_url:user }}">
-                <span class="badge bg-dark">{{ obj.get_request_type }}</span>
-                <span class="small">
-                  issued on {{ obj.date_created|date:"Y-m-d H:i" }},
-                  last modified on {{ obj.date_modified|date:"Y-m-d H:i" }}
-                </span>
-              </a>
-            </li>
-          {% endfor %}
-        </ul>
-      </div>
-    </div>
-  {% endif %}
-</div>
 
-<div class="row">
-  <div class="col-6">
-    <div class="card bg-light">
-      <div class="card-header">
-        <h5 class="card-title lead">Manage Group</h5>
-      </div>
-      <div class="card-body d-grid gap-2">
-        <!-- {% if has_pending_group_change_request %}
-          <a class="btn btn-secondary disabled" href="#">
-            Group Update Request Pending
-          </a>
-        {% elif retracted_group_change_request %}
-          <a
-            class="btn btn-secondary"
-            href="{% url 'usersec:hpcgroupchangerequest-update' hpcgroupchangerequest=retracted_group_change_request %}"
-          >
-            Resume Group Update Request
-          </a>
-        {% else %}
-          <a
-            class="btn btn-secondary"
-            href="{% url 'usersec:hpcgroupchangerequest-create' hpcgroup=object.primary_group.uuid %}"
-          >
-            Update Group <span class="small">(Resources, Delegate, Expiration)</span>
-          </a>
-        {% endif %} -->
+<div class="dropdown float-end">
+  <button class="btn btn-secondary dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-expanded="false">
+    Make Request
+  </button>
+  <ul class="dropdown-menu dropdown-menu-end">
+    <li><h6 class="dropdown-header">Group</h6></li>
+    {% if retracted_group_change_request %}
+      <li>
         <a
-          class="btn btn-secondary"
-          href="{% url 'usersec:hpcusercreaterequest-create' hpcgroup=object.primary_group.uuid %}"
+          class="dropdown-item"
+          href="{% url 'usersec:hpcgroupchangerequest-detail' hpcgroupchangerequest=retracted_group_change_request %}"
         >
-          Invite Member to Group
+          Resume Update
         </a>
-        <!-- <div class="input-group">
-          <button type="button" class="btn btn-secondary" id="submitMemberSelection">
-            Extend Membership for
-          </button>
-          {{ form_user_select.members }}
-        </div> -->
-      </div>
-    </div>
-  </div>
-
-  <div class="col-6">
-    <div class="card bg-light">
-      <div class="card-header">
-        <h5 class="card-title lead">Manage Projects</h5>
-      </div>
-      <div class="card-body d-grid gap-2">
-        <a class="btn btn-secondary" href="{% url 'usersec:hpcprojectcreaterequest-create' hpcgroup=object.primary_group.uuid %}">
-          Request New Project
-        </a>
-        <!-- <div class="input-group">
-          <button
-            type="button"
-            class="btn btn-secondary"
-            id="submitProjectSelection"
-            {% if not projects_available %}
-              disabled
-            {% endif %}
-          >
-            Update Project
-          </button>
-          {{ form_project_select.projects }}
-        </div> -->
-        <!-- <a class="btn btn-outline-danger disabled">
-          <i class="iconify" data-icon="mdi:trash-can"></i>
-          Delete Project
-        </a>
-        <a class="btn btn-outline-danger disabled">
-          <i class="iconify" data-icon="mdi:trash-can"></i>
-          Request to Delete Group
+      </li>
+    {% else %}
+      <li>
+        <a
+          class="dropdown-item {% if has_pending_group_change_request %}disabled{% endif %}"
+          href="{% url 'usersec:hpcgroupchangerequest-create' hpcgroup=object.primary_group.uuid %}"
+        >
+          Update Group
         </a>
-        <a class="btn btn-outline-danger disabled">
-          <i class="iconify" data-icon="mdi:trash-can"></i>
-          Request to Remove Member
-        </a> -->
-    </div>
-  </div>
+      </li>
+    {% endif %}
+    <li>
+      <a
+        class="dropdown-item"
+        href="{% url 'usersec:hpcusercreaterequest-create' hpcgroup=object.primary_group.uuid %}"
+      >
+        Invite User
+      </a>
+    </li>
+    <li><hr class="dropdown-divider"></li>
+    <li><h6 class="dropdown-header">Project</h6></li>
+    <li>
+      <a class="dropdown-item" href="{% url 'usersec:hpcprojectcreaterequest-create' hpcgroup=object.primary_group.uuid %}">
+        New Project
+      </a>
+    </li>
+  </ul>
 </div>
 
+<h4 class="mt-4">Open Requests</h4>
+
+<table class="table">
+  <thead>
+    <tr>
+      <th>Request Type</th>
+      <th>Created</th>
+      <th>Modified</th>
+      <th>Status</th>
+      <th></th>
+    </tr>
+  </thead>
+  <tbody>
+    {% for obj in requests %}
+      <tr>
+        <td>{{ obj.get_request_type }}</td>
+        <td>{{ obj.date_created|date:"Y-m-d H:i" }}</td>
+        <td>{{ obj.date_modified|date:"Y-m-d H:i" }}</td>
+        <td><span class="badge bg-{{ obj.status|colorize_request_status }}">{{ obj.status }}</span></td>
+        <td class="text-end">
+          <div class="btn-group">
+            {% if is_decided %}
+              <a class="btn btn-success btn-sm"
+                href="{{ object.get_archive_url }}"
+              >
+                <i class="iconify" data-icon="mdi:archive"></i>
+              </a>
+            {% endif %}
+            <a href="{{ obj|get_detail_url:user }}" class="btn btn-secondary btn-sm">
+              <i class="iconify" data-icon="mdi:eye"></i>
+            </a>
+          </div>
+        </td>
+      </tr>
+    {% empty %}
+      <tr>
+        <td colspan="5" class="text-center">
+          <em class="text-muted">No pending requests.</em>
+        </td>
+      </tr>
+    {% endfor %}
+  </tbody>
+</table>
+
+<h4 class="mt-4">Group Members</h4>
+
+<table class="table">
+  <thead>
+    <tr>
+      <th>Name</th>
+      <th>Username</th>
+      <th>Joined</th>
+      <th>Expires</th>
+      <th></th>
+    </tr>
+  </thead>
+  <tbody>
+    {% for member in object.primary_group.hpcuser.all|order_by:"user__name" %}
+      <tr>
+        <td>{{ member.user.name }}</td>
+        <td>{{ member.username }}</td>
+        <td>{{ member.date_created|date:"Y-m-d H:i" }}</td>
+        <td>{{ member.expiration|date:"Y-m-d H:i" }}</td>
+        <td class="text-end">
+          <div class="btn-group">
+            <a
+              href="{% url 'usersec:hpcuserchangerequest-create' hpcuser=member.uuid %}"
+              class="btn btn-secondary btn-sm">
+              <i class="iconify" data-icon="mdi:account-edit"></i>
+            </a>
+            <a
+              href="#"
+              class="btn btn-danger btn-sm disabled">
+              <i class="iconify" data-icon="mdi:account-remove"></i>
+            </a>
+          </div>
+        </td>
+      </tr>
+    {% empty %}
+      <tr>
+        <td colspan="5" class="text-center">
+          <em class="text-muted">No users.</em>
+        </td>
+      </tr>
+    {% endfor %}
+  </tbody>
+</table>
+
+<h4 class="mt-4">Projects</h4>
+
+<table class="table">
+  <thead>
+    <tr>
+      <th>Name</th>
+      <th>Delegate</th>
+      <th>Created</th>
+      <th>Expires</th>
+      <th></th>
+    </tr>
+  </thead>
+  <tbody>
+    {% for project in object.hpcproject_members.all|order_by:"name" %}
+      <tr>
+        <td>{{ project.name }}</td>
+        <td>{{ project.delegate.user.name|default:"<em class='text-muted'>None</em>" }}</td>
+        <td>{{ project.date_created|date:"Y-m-d H:i" }}</td>
+        <td>{{ project.expiration|date:"Y-m-d H:i" }}</td>
+        <td class="text-end">
+          <div class="btn-group">
+            <a href="{% url 'usersec:hpcprojectchangerequest-create' hpcproject=project.uuid %}" class="btn btn-secondary btn-sm">
+              <i class="iconify" data-icon="mdi:edit"></i>
+            </a>
+            <a href="#" class="btn btn-danger btn-sm disabled">
+              <i class="iconify" data-icon="mdi:remove"></i>
+            </a>
+          </div>
+        </td>
+      </tr>
+    {% empty %}
+      <tr>
+        <td colspan="5" class="text-center">
+          <em class="text-muted">No projects.</em>
+        </td>
+      </tr>
+    {% endfor %}
+  </tbody>
+</table>
+
 {% block inline_javascript %}
 
   <script>
diff --git a/usersec/templates/usersec/modules/request_buttons_user.html b/usersec/templates/usersec/modules/request_buttons_user.html
index 59ea48a..228f021 100644
--- a/usersec/templates/usersec/modules/request_buttons_user.html
+++ b/usersec/templates/usersec/modules/request_buttons_user.html
@@ -5,7 +5,21 @@
 {% endif %}
 
 <span class="btn-group">
-  {% if not is_decided %}
+  {% if is_decided %}
+    {% if is_hpc_group_create_request %}
+      <a class="btn btn-danger"
+          href="{{ object.get_delete_url }}"
+      >
+        Delete
+      </a>
+    {% else %}
+      <a class="btn btn-secondary"
+         href="{{ object.get_archive_url }}"
+      >
+        Archive
+      </a>
+    {% endif %}
+  {% else %}
     {% if not is_active %}
       <a class="btn btn-secondary"
          href="{{ object.get_update_url }}"
@@ -19,16 +33,19 @@
       >
         Re-activate
       </a>
+    {% endif %}
+    {% if is_active %}
       <a class="btn btn-danger"
-         href="{{ object.get_delete_url }}"
+         href="{{ object.get_retract_url }}"
       >
-        Delete
+        Retract
       </a>
-    {% else %}
+    {% endif %}
+    {% if not is_active %}
       <a class="btn btn-danger"
-         href="{{ object.get_retract_url }}"
+          href="{{ object.get_delete_url }}"
       >
-        Retract
+        Delete
       </a>
     {% endif %}
   {% endif %}
diff --git a/usersec/templates/usersec/modules/request_grid.html b/usersec/templates/usersec/modules/request_grid.html
deleted file mode 100644
index e8749f0..0000000
--- a/usersec/templates/usersec/modules/request_grid.html
+++ /dev/null
@@ -1,111 +0,0 @@
-{% load common %}
-
-<div class="row mb-4">
-  <div class="col-4 text-center">
-    <h3>
-      <i class="iconify" data-icon="mdi:user-group"></i>
-      Group
-    </h3>
-  </div>
-  <div class="col-4 text-center">
-    <h3>
-      <i class="iconify" data-icon="mdi:user"></i>
-      User
-    </h3>
-  </div>
-  <div class="col-4 text-center">
-    <h3>
-      <i class="iconify" data-icon="mdi:package-variant"></i>
-      Project
-    </h3>
-  </div>
-</div>
-<div class="row mb-4">
-  <div class="col-4">
-    {% if admin %}
-      {% include 'usersec/modules/request_grid_group_create.html' %}
-    {% else %}
-      {% include 'usersec/modules/request_grid_no_permission.html' with request='create' obj='group' %}
-    {% endif %}
-  </div>
-  <div class="col-4">
-    {% if admin or group_manager %}
-      {% include 'usersec/modules/request_grid_user_create.html' %}
-    {% else %}
-      {% include 'usersec/modules/request_grid_no_permission.html' with request='create' obj='user' %}
-    {% endif %}
-  </div>
-  <div class="col-4">
-    {% if admin or group_manager %}
-      {% include 'usersec/modules/request_grid_project_create.html' %}
-    {% else %}
-      {% include 'usersec/modules/request_grid_no_permission.html' with request='create' obj='project' %}
-    {% endif %}
-  </div>
-</div>
-<div class="row mb-4">
-  <div class="col-4">
-    {% if admin or group_manager %}
-      {% include 'usersec/modules/request_grid_group_change.html' %}
-    {% else %}
-      {% include 'usersec/modules/request_grid_no_permission.html' with request='update' obj='group' %}
-    {% endif %}
-  </div>
-  <div class="col-4">
-    {% if admin or group_manager %}
-      {% include 'usersec/modules/request_grid_user_change.html' %}
-    {% else %}
-      {% include 'usersec/modules/request_grid_no_permission.html' with request='update' obj='user' %}
-    {% endif %}
-  </div>
-  <div class="col-4">
-    {% if admin or group_manager or project_manager %}
-      {% include 'usersec/modules/request_grid_project_change.html' %}
-    {% else %}
-      {% include 'usersec/modules/request_grid_no_permission.html' with request='update' obj='project' %}
-    {% endif %}
-  </div>
-</div>
-<div class="row mb-4">
-  <div class="col-4">
-    {% if admin or group_manager %}
-      {% include 'usersec/modules/request_grid_group_delete.html' %}
-    {% else %}
-      {% include 'usersec/modules/request_grid_no_permission.html' with request='delete' obj='group' %}
-    {% endif %}
-  </div>
-  <div class="col-4">
-    {% if admin or group_manager %}
-      {% include 'usersec/modules/request_grid_user_delete.html' %}
-    {% else %}
-      {% include 'usersec/modules/request_grid_no_permission.html' with request='delete' obj='user' %}
-    {% endif %}
-  </div>
-  <div class="col-4">
-    {% if admin or group_manager or project_manager %}
-      {% include 'usersec/modules/request_grid_project_delete.html' %}
-    {% else %}
-      {% include 'usersec/modules/request_grid_no_permission.html' with request='delete' obj='project' %}
-    {% endif %}
-  </div>
-</div>
-
-{% block inline_javascript %}
-
-  <script>
-    $("#submitMemberSelection").click(function() {
-      let member_url = $("#id_members").val();
-      if (member_url) {
-        window.location.href = member_url;
-      }
-    });
-
-    $("#submitProjectSelection").click(function() {
-      let project_url = $("#id_projects").val();
-      if (project_url) {
-        window.location.href = project_url;
-      }
-    });
-  </script>
-
-{% endblock inline_javascript %}
diff --git a/usersec/templates/usersec/modules/request_grid_group_change.html b/usersec/templates/usersec/modules/request_grid_group_change.html
deleted file mode 100644
index a28fe9b..0000000
--- a/usersec/templates/usersec/modules/request_grid_group_change.html
+++ /dev/null
@@ -1,32 +0,0 @@
-{% load common %}
-
-<div class="card mt-5">
-  <div class="card-header">
-    <h5 class="card-title">
-      {% if admin %}
-        <i class="iconify" data-icon="mdi:refresh"></i>
-        Change Requests
-      {% else %}
-        <a class="btn btn-sm btn-outline-secondary" href="{% url 'usersec:hpcgroupchangerequest-create' hpcgroup=object.primary_group.uuid %}">
-          <i class="iconify" data-icon="mdi:refresh"></i>
-          Update Group
-        </a>
-      {% endif %}
-    </h5>
-  </div>
-  <ul class="list-group list-group-flush overflow-auto" style="max-height: 150px">
-    {% for obj in hpcgroupchangerequests %}
-      <li class="list-group-item">
-        <a href="{{ obj|get_detail_url:user }}">{{ obj.group.name }}</a>
-        <span class="badge bg-{{ obj.status|colorize_request_status }}">
-          {{ obj.display_status }}
-        </span>
-        <div class="small text-muted">
-          <strong>{{ obj.requester.username }}</strong>
-          {{ obj.date_created|date:"Y-m-d H:i" }}
-        </div>      </li>
-    {% empty %}
-      <li class="list-group-item"><em class="text-muted">No requests.</em></li>
-    {% endfor %}
-  </ul>
-</div>
diff --git a/usersec/templates/usersec/modules/request_grid_group_create.html b/usersec/templates/usersec/modules/request_grid_group_create.html
deleted file mode 100644
index 5fe44c8..0000000
--- a/usersec/templates/usersec/modules/request_grid_group_create.html
+++ /dev/null
@@ -1,25 +0,0 @@
-{% load common %}
-
-<div class="card mt-5">
-  <div class="card-header">
-    <h5 class="card-title">
-      <i class="iconify" data-icon="mdi:create"></i>
-      Create Requests
-    </h5>
-  </div>
-  <ul class="list-group list-group-flush overflow-auto" style="max-height: 150px">
-    {% for obj in hpcgroupcreaterequests %}
-      <li class="list-group-item">
-        <a href="{{ obj|get_detail_url:user }}">{{ obj.requester.username }}</a>
-        <span class="badge bg-{{ obj.status|colorize_request_status }}">
-          {{ obj.display_status }}
-        </span>
-        <small class="text-muted">
-          {{ obj.date_created|date:"Y-m-d H:i" }}
-        </small>
-      </li>
-    {% empty %}
-      <li class="list-group-item"><em class="text-muted">No requests.</em></li>
-    {% endfor %}
-  </ul>
-</div>
diff --git a/usersec/templates/usersec/modules/request_grid_group_delete.html b/usersec/templates/usersec/modules/request_grid_group_delete.html
deleted file mode 100644
index 05f56c2..0000000
--- a/usersec/templates/usersec/modules/request_grid_group_delete.html
+++ /dev/null
@@ -1,29 +0,0 @@
-{% load common %}
-
-<div class="card mt-5">
-  <div class="card-header">
-    <h5 class="card-title">
-      {% if admin %}
-        <i class="iconify" data-icon="mdi:trash-can"></i>
-        Delete Requests
-      {% else %}
-        <a class="btn btn-sm btn-outline-danger disabled">
-          <i class="iconify" data-icon="mdi:trash-can"></i>
-          Delete Group
-        </a>
-      {% endif %}
-    </h5>
-  </div>
-  <ul class="list-group list-group-flush overflow-auto" style="max-height: 150px">
-    {% for obj in hpcgroupdeleterequests %}
-      <li class="list-group-item">
-        <a href="{{ obj|get_detail_url:user }}">{{ obj.requester.username }}</a>
-        <span class="badge bg-{{ obj.status|colorize_request_status }}">
-          {{ obj.display_status }}
-        </span>
-      </li>
-    {% empty %}
-      <li class="list-group-item"><em class="text-muted">No requests.</em></li>
-    {% endfor %}
-  </ul>
-</div>
diff --git a/usersec/templates/usersec/modules/request_grid_no_permission.html b/usersec/templates/usersec/modules/request_grid_no_permission.html
deleted file mode 100644
index 47c15da..0000000
--- a/usersec/templates/usersec/modules/request_grid_no_permission.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<div class="card mt-5">
-  <div class="card-header">
-    <h5 class="card-title">
-      {% if request == 'create' %}
-        <i class="iconify" data-icon="mdi:create"></i>
-        Create {{ obj.capitalize }}
-      {% elif request == 'update' %}
-        <i class="iconify" data-icon="mdi:refresh"></i>
-        Update {{ obj.capitalize }}
-      {% elif request == 'delete' %}
-        <i class="iconify" data-icon="mdi:trash-can"></i>
-        Delete {{ obj.capitalize }}
-      {% endif %}
-    </h5>
-  </div>
-  <div class="card-body">
-    <p class="card-text fst-italic text-muted">You do not have permission to {{ request }} a {{ obj }}.</p>
-  </div>
-</div>
diff --git a/usersec/templates/usersec/modules/request_grid_project_change.html b/usersec/templates/usersec/modules/request_grid_project_change.html
deleted file mode 100644
index 1eb9504..0000000
--- a/usersec/templates/usersec/modules/request_grid_project_change.html
+++ /dev/null
@@ -1,43 +0,0 @@
-{% load common %}
-
-<div class="card mt-5">
-  <div class="card-header">
-    <h5 class="card-title">
-      {% if admin %}
-        <i class="iconify" data-icon="mdi:refresh"></i>
-        Change Requests
-      {% else %}
-        <div class="input-group">
-          <button
-            type="button"
-            class="btn btn-sm btn-outline-secondary"
-            id="submitProjectSelection"
-            {% if not projects_available %}
-              disabled
-            {% endif %}
-          >
-            <i class="iconify" data-icon="mdi:refresh"></i>
-            Update Project
-          </button>
-          {{ form_project_select.projects }}
-        </div>
-      {% endif %}
-    </h5>
-  </div>
-  <ul class="list-group list-group-flush overflow-auto" style="max-height: 150px">
-    {% for obj in hpcprojectchangerequests %}
-      <li class="list-group-item">
-        <a href="{{ obj|get_detail_url:user }}">{{ obj.project.name_requested }}</a>
-        <span class="badge bg-{{ obj.status|colorize_request_status }}">
-          {{ obj.display_status }}
-        </span>
-        <div class="small text-muted">
-          <strong>{{ obj.requester.username }}</strong>
-          {{ obj.date_created|date:"Y-m-d H:i" }}
-        </div>
-      </li>
-    {% empty %}
-      <li class="list-group-item"><em class="text-muted">No requests.</em></li>
-    {% endfor %}
-  </ul>
-</div>
diff --git a/usersec/templates/usersec/modules/request_grid_project_create.html b/usersec/templates/usersec/modules/request_grid_project_create.html
deleted file mode 100644
index b7cb14d..0000000
--- a/usersec/templates/usersec/modules/request_grid_project_create.html
+++ /dev/null
@@ -1,33 +0,0 @@
-{% load common %}
-
-<div class="card mt-5">
-  <div class="card-header">
-    <h5 class="card-title">
-      {% if admin %}
-        <i class="iconify" data-icon="mdi:create"></i>
-        Create Requests
-      {% else %}
-        <a class="btn btn-sm btn-outline-secondary" href="{% url 'usersec:hpcprojectcreaterequest-create' hpcgroup=object.primary_group.uuid %}">
-          <i class="iconify" data-icon="mdi:create"></i>
-          Request New Project
-        </a>
-      {% endif %}
-    </h5>
-  </div>
-  <ul class="list-group list-group-flush overflow-auto" style="max-height: 150px">
-    {% for obj in hpcprojectcreaterequests %}
-      <li class="list-group-item">
-        <a href="{{ obj|get_detail_url:user }}">{{ obj.name_requested }}</a>
-        <span class="badge bg-{{ obj.status|colorize_request_status }}">
-          {{ obj.display_status }}
-        </span>
-        <div class="small text-muted">
-          <strong>{{ obj.requester.username }}</strong>
-          {{ obj.date_created|date:"Y-m-d H:i" }}
-        </div>
-      </li>
-    {% empty %}
-      <li class="list-group-item"><em class="text-muted">No requests.</em></li>
-    {% endfor %}
-  </ul>
-</div>
diff --git a/usersec/templates/usersec/modules/request_grid_project_delete.html b/usersec/templates/usersec/modules/request_grid_project_delete.html
deleted file mode 100644
index 73b6ab8..0000000
--- a/usersec/templates/usersec/modules/request_grid_project_delete.html
+++ /dev/null
@@ -1,29 +0,0 @@
-{% load common %}
-
-<div class="card mt-5">
-  <div class="card-header">
-    <h5 class="card-title">
-      {% if admin %}
-        <i class="iconify" data-icon="mdi:trash-can"></i>
-        Delete Requests
-      {% else %}
-        <a class="btn btn-sm btn-outline-danger disabled">
-          <i class="iconify" data-icon="mdi:trash-can"></i>
-          Delete Project
-        </a>
-      {% endif %}
-    </h5>
-  </div>
-  <ul class="list-group list-group-flush overflow-auto" style="max-height: 150px">
-    {% for obj in hpcprojectdeleterequests %}
-      <li class="list-group-item">
-        <a href="{{ obj|get_detail_url:user }}">{{ obj.requester.username }}</a>
-        <span class="badge bg-{{ obj.status|colorize_request_status }}">
-          {{ obj.display_status }}
-        </span>
-      </li>
-    {% empty %}
-      <li class="list-group-item"><em class="text-muted">No requests.</em></li>
-    {% endfor %}
-  </ul>
-</div>
diff --git a/usersec/templates/usersec/modules/request_grid_user_change.html b/usersec/templates/usersec/modules/request_grid_user_change.html
deleted file mode 100644
index de944ad..0000000
--- a/usersec/templates/usersec/modules/request_grid_user_change.html
+++ /dev/null
@@ -1,36 +0,0 @@
-{% load common %}
-
-<div class="card mt-5">
-  <div class="card-header">
-    <h5 class="card-title">
-      {% if admin %}
-        <i class="iconify" data-icon="mdi:refresh"></i>
-        Change Requests
-      {% else %}
-        <div class="input-group">
-          <button type="button" class="btn btn-sm btn-outline-secondary" id="submitMemberSelection">
-            <i class="iconify" data-icon="mdi:refresh"></i>
-            Update User
-          </button>
-          {{ form_user_select.members }}
-        </div>
-      {% endif %}
-    </h5>
-  </div>
-  <ul class="list-group list-group-flush overflow-auto" style="max-height: 150px">
-    {% for obj in hpcuserchangerequests %}
-      <li class="list-group-item text-muted">
-        <a href="{{ obj|get_detail_url:user }}">{{ obj.user.user.name }}</a> |
-        <strong class="small text-muted">{{ obj.user.username }}</strong>
-        <span class="badge bg-{{ obj.status|colorize_request_status }}">
-          {{ obj.display_status }}
-        </span>
-        <div class="small text-muted">
-          <strong>{{ obj.requester.username }}</strong>
-          {{ obj.date_created|date:"Y-m-d H:i" }}
-        </div>      </li>
-    {% empty %}
-      <li class="list-group-item"><em class="text-muted">No requests.</em></li>
-    {% endfor %}
-  </ul>
-</div>
diff --git a/usersec/templates/usersec/modules/request_grid_user_create.html b/usersec/templates/usersec/modules/request_grid_user_create.html
deleted file mode 100644
index 1189eae..0000000
--- a/usersec/templates/usersec/modules/request_grid_user_create.html
+++ /dev/null
@@ -1,33 +0,0 @@
-{% load common %}
-
-<div class="card mt-5">
-  <div class="card-header">
-    <h5 class="card-title">
-      {% if admin %}
-        <i class="iconify" data-icon="mdi:create"></i>
-        Create Requests
-      {% else %}
-        <a class="btn btn-sm btn-outline-secondary" href="{% url 'usersec:hpcusercreaterequest-create' hpcgroup=object.primary_group.uuid %}">
-          <i class="iconify" data-icon="mdi:create"></i>
-          Add User To Group
-        </a>
-      {% endif %}
-    </h5>
-  </div>
-  <ul class="list-group list-group-flush overflow-auto" style="max-height: 150px">
-    {% for obj in hpcusercreaterequests %}
-      <li class="list-group-item">
-        <a href="{{ obj|get_detail_url:user }}">{{ obj.email }}</a>
-        <span class="badge bg-{{ obj.status|colorize_request_status }}">
-          {{ obj.display_status }}
-        </span>
-        <div class="small text-muted">
-          <strong>{{ obj.requester.username }}</strong>
-          {{ obj.date_created|date:"Y-m-d H:i" }}
-        </div>
-      </li>
-    {% empty %}
-      <li class="list-group-item"><em class="text-muted">No requests.</em></li>
-    {% endfor %}
-  </ul>
-</div>
diff --git a/usersec/templates/usersec/modules/request_grid_user_delete.html b/usersec/templates/usersec/modules/request_grid_user_delete.html
deleted file mode 100644
index 7782531..0000000
--- a/usersec/templates/usersec/modules/request_grid_user_delete.html
+++ /dev/null
@@ -1,29 +0,0 @@
-{% load common %}
-
-<div class="card mt-5">
-  <div class="card-header">
-    <h5 class="card-title">
-      {% if admin %}
-        <i class="iconify" data-icon="mdi:trash-can"></i>
-        Delete Requests
-      {% else %}
-        <a class="btn btn-sm btn-outline-danger disabled">
-          <i class="iconify" data-icon="mdi:trash-can"></i>
-          Delete User
-        </a>
-      {% endif %}
-    </h5>
-  </div>
-  <ul class="list-group list-group-flush overflow-auto" style="max-height: 150px">
-    {% for obj in hpcuserdeleterequests %}
-      <li class="list-group-item">
-        <a href="{{ obj|get_detail_url:user }}">{{ obj.requester.username }}</a>
-        <span class="badge bg-{{ obj.status|colorize_request_status }}">
-          {{ obj.display_status }}
-        </span>
-      </li>
-    {% empty %}
-      <li class="list-group-item"><em class="text-muted">No requests.</em></li>
-    {% endfor %}
-  </ul>
-</div>
diff --git a/usersec/templates/usersec/modules/request_status_card.html b/usersec/templates/usersec/modules/request_status_card.html
new file mode 100644
index 0000000..544b8f4
--- /dev/null
+++ b/usersec/templates/usersec/modules/request_status_card.html
@@ -0,0 +1,27 @@
+{% load common %}
+
+<div class="mt-4 card bg-{{ object.status|colorize_request_status }}">
+  <div class="card-body lead text-{{ object.status|colorize_text }}">
+    {% if object.status == "ACTIVE" or object.status == "REVISED" %}
+      We are working on your request and you will receive an email once we approve it.
+    {% elif object.status == "RETRACTED" %}
+      You have retracted your request. Click <strong>Re-activate</strong> to activate the request.
+    {% elif object.status == "REVISION" %}
+      We have asked you to revise your request with the following comment:
+      <p>
+        {% with object.get_comment_history|last as comment %}
+          &quot;{{ comment.2 }}&quot;
+        {% endwith %}
+      </p>
+    {% elif object.status == "APPROVED" %}
+      We have approved your request.
+    {% elif object.status == "DENIED" %}
+      We have denied your request with the following comment:
+      <p>
+        {% with object.get_comment_history|last as comment %}
+          &quot;{{ comment.2 }}&quot;
+        {% endwith %}
+      </p>
+    {% endif %}
+  </div>
+</div>
\ No newline at end of file
diff --git a/usersec/templatetags/common.py b/usersec/templatetags/common.py
index 883d533..1eac8cc 100644
--- a/usersec/templatetags/common.py
+++ b/usersec/templatetags/common.py
@@ -52,9 +52,9 @@ def site_version():
     REQUEST_STATUS_INITIAL: "info",
     REQUEST_STATUS_ACTIVE: "info",
     REQUEST_STATUS_REVISION: "warning",
-    REQUEST_STATUS_REVISED: "secondary",
+    REQUEST_STATUS_REVISED: "info",
     REQUEST_STATUS_APPROVED: "success",
-    REQUEST_STATUS_DENIED: "secondary",
+    REQUEST_STATUS_DENIED: "danger",
     REQUEST_STATUS_RETRACTED: "secondary",
 }
 
@@ -65,6 +65,16 @@ def colorize_request_status(status):
     return REQUEST_STATUS_COLOR_MAPPING.get(status, "dark")
 
 
+@register.filter
+def colorize_text(status):
+    """Return the color for a given status."""
+    color = REQUEST_STATUS_COLOR_MAPPING.get(status, "dark")
+    if color in ("warning", "info"):
+        return "dark"
+    else:
+        return "light"
+
+
 @register.filter
 def colorize_object_status(status):
     """Return the color for a given status."""
diff --git a/usersec/urls.py b/usersec/urls.py
index 290fc9e..284eaa5 100644
--- a/usersec/urls.py
+++ b/usersec/urls.py
@@ -50,6 +50,11 @@
         view=views.HpcGroupCreateRequestDeleteView.as_view(),
         name="hpcgroupcreaterequest-delete",
     ),
+    path(
+        "hpcgroupcreaterequest/<uuid:hpcgroupcreaterequest>/archive/",
+        view=views.HpcGroupCreateRequestArchiveView.as_view(),
+        name="hpcgroupcreaterequest-archive",
+    ),
     # ------------------------------------------------------------------------------
     # HpcGroupChangeRequest related
     # ------------------------------------------------------------------------------
@@ -83,6 +88,11 @@
         view=views.HpcGroupChangeRequestDeleteView.as_view(),
         name="hpcgroupchangerequest-delete",
     ),
+    path(
+        "hpcgroupchangerequest/<uuid:hpcgroupchangerequest>/archive/",
+        view=views.HpcGroupChangeRequestArchiveView.as_view(),
+        name="hpcgroupchangerequest-archive",
+    ),
     # ------------------------------------------------------------------------------
     # HpcGroupDeleteRequest related
     # ------------------------------------------------------------------------------
@@ -116,6 +126,11 @@
         view=views.HpcGroupDeleteRequestDeleteView.as_view(),
         name="hpcgroupdeleterequest-delete",
     ),
+    path(
+        "hpcgroupdeleterequest/<uuid:hpcgroupdeleterequest>/archive/",
+        view=views.HpcGroupDeleteRequestArchiveView.as_view(),
+        name="hpcgroupdeleterequest-archive",
+    ),
     # ------------------------------------------------------------------------------
     # HpcUser related
     # ------------------------------------------------------------------------------
@@ -162,6 +177,11 @@
         view=views.HpcUserCreateRequestDeleteView.as_view(),
         name="hpcusercreaterequest-delete",
     ),
+    path(
+        "hpcusercreaterequest/<uuid:hpcusercreaterequest>/archive/",
+        view=views.HpcUserCreateRequestArchiveView.as_view(),
+        name="hpcusercreaterequest-archive",
+    ),
     # ------------------------------------------------------------------------------
     # HpcUserChangeRequest related
     # ------------------------------------------------------------------------------
@@ -228,6 +248,11 @@
         view=views.HpcUserDeleteRequestDeleteView.as_view(),
         name="hpcuserdeleterequest-delete",
     ),
+    path(
+        "hpcuserdeleterequest/<uuid:hpcuserdeleterequest>/archive/",
+        view=views.HpcUserDeleteRequestArchiveView.as_view(),
+        name="hpcuserdeleterequest-archive",
+    ),
     # ------------------------------------------------------------------------------
     # HpcProject related
     # ------------------------------------------------------------------------------
@@ -269,6 +294,11 @@
         view=views.HpcProjectCreateRequestDeleteView.as_view(),
         name="hpcprojectcreaterequest-delete",
     ),
+    path(
+        "hpcprojectcreaterequest/<uuid:hpcprojectcreaterequest>/archive/",
+        view=views.HpcProjectCreateRequestArchiveView.as_view(),
+        name="hpcprojectcreaterequest-archive",
+    ),
     # ------------------------------------------------------------------------------
     # HpcProjectChangeRequest related
     # ------------------------------------------------------------------------------
@@ -302,6 +332,11 @@
         view=views.HpcProjectChangeRequestDeleteView.as_view(),
         name="hpcprojectchangerequest-delete",
     ),
+    path(
+        "hpcprojectchangerequest/<uuid:hpcprojectchangerequest>/archive/",
+        view=views.HpcProjectChangeRequestArchiveView.as_view(),
+        name="hpcprojectchangerequest-archive",
+    ),
     # ------------------------------------------------------------------------------
     # HpcProjectDeleteRequest related
     # ------------------------------------------------------------------------------
@@ -335,6 +370,11 @@
         view=views.HpcProjectDeleteRequestDeleteView.as_view(),
         name="hpcprojectdeleterequest-delete",
     ),
+    path(
+        "hpcprojectdeleterequest/<uuid:hpcprojectdeleterequest>/archive/",
+        view=views.HpcProjectDeleteRequestArchiveView.as_view(),
+        name="hpcprojectdeleterequest-archive",
+    ),
     # ------------------------------------------------------------------------------
     # HpcGroupInvitation related
     # ------------------------------------------------------------------------------
diff --git a/usersec/views.py b/usersec/views.py
index 3a848cb..521b4b4 100644
--- a/usersec/views.py
+++ b/usersec/views.py
@@ -44,7 +44,11 @@
     INVITATION_STATUS_REJECTED,
     OBJECT_STATUS_ACTIVE,
     REQUEST_STATUS_ACTIVE,
+    REQUEST_STATUS_APPROVED,
+    REQUEST_STATUS_ARCHIVED,
+    REQUEST_STATUS_DENIED,
     REQUEST_STATUS_RETRACTED,
+    REQUEST_STATUS_REVISED,
     REQUEST_STATUS_REVISION,
     TERMS_AUDIENCE_ALL,
     TERMS_AUDIENCE_PI,
@@ -74,11 +78,8 @@
 MSG_PART_SUBMITTED = "submitted"
 MSG_PART_UPDATE = "update"
 MSG_PART_UPDATED = "updated"
-MSG_PART_RETRACT = "retract"
-MSG_PART_RETRACTED = "retracted"
-MSG_PART_REACTIVATE = "re-activate"
-MSG_PART_REACTIVATED = "re-activated"
 MSG_PART_DELETED = "deleted"
+MSG_PART_ARCHIVED = "archived"
 MSG_PART_GROUP_CREATION = "group creation"
 MSG_PART_GROUP_UPDATE = "group update"
 MSG_PART_GROUP_DELETION = "group deletion"
@@ -104,14 +105,6 @@
 MSG_TERMS_CONSENT = "Consented successfully to terms and conditions."
 
 
-# -----------------------------------------------------------------------------
-# Object comments
-# -----------------------------------------------------------------------------
-
-COMMENT_REACTIVATED = "Request re-activated"
-COMMENT_RETRACTED = "Request retracted"
-
-
 class HpcPermissionMixin(LoginRequiredMixin, PermissionRequiredMixin):
     """Customized required login and permission mixin."""
 
@@ -211,9 +204,6 @@ def form_valid(self, form):
             send_notification_manager_group_request(obj)
             send_notification_admin_request(obj)
 
-        messages.success(
-            self.request, MSG_REQUEST_SUCCESS.format(MSG_PART_SUBMITTED, MSG_PART_GROUP_CREATION)
-        )
         return HttpResponseRedirect(self.get_success_url(obj.uuid))
 
 
@@ -236,6 +226,8 @@ def get_context_data(self, **kwargs):
         context["is_active"] = obj.is_active()
         context["is_revision"] = obj.is_revision()
         context["is_revised"] = obj.is_revised()
+        context["is_archived"] = obj.is_archived()
+        context["is_hpc_group_create_request"] = True
         return context
 
 
@@ -288,33 +280,23 @@ def form_valid(self, form):
             )
             return HttpResponseRedirect(reverse("usersec:orphan-user"))
 
-        # No email notification required
-        messages.success(
-            self.request, MSG_REQUEST_SUCCESS.format(MSG_PART_UPDATED, MSG_PART_GROUP_CREATION)
-        )
         return HttpResponseRedirect(self.get_success_url())
 
 
-class HpcGroupCreateRequestRetractView(HpcPermissionMixin, DeleteView):
+class HpcGroupCreateRequestRetractView(HpcPermissionMixin, SingleObjectMixin, View):
     """HPC group create request update view."""
 
-    template_name_suffix = "_retract_confirm"
     model = HpcGroupCreateRequest
     slug_field = "uuid"
     slug_url_kwarg = "hpcgroupcreaterequest"
     permission_required = "usersec.manage_hpcgroupcreaterequest"
 
-    def post(self, request, *args, **kwargs):
+    def get(self, request, *args, **kwargs):
         obj = self.get_object()
-        obj.comment = COMMENT_RETRACTED
         obj.editor = self.request.user
+        obj.comment = ""
         obj.retract_with_version()
 
-        # No email notification required
-        messages.success(
-            self.request, MSG_REQUEST_SUCCESS.format(MSG_PART_RETRACTED, MSG_PART_GROUP_CREATION)
-        )
-
         return HttpResponseRedirect(
             reverse(
                 "usersec:hpcgroupcreaterequest-detail",
@@ -334,22 +316,14 @@ class HpcGroupCreateRequestReactivateView(HpcPermissionMixin, SingleObjectMixin,
     def get(self, request, *args, **kwargs):
         obj = self.get_object()
         obj.status = REQUEST_STATUS_ACTIVE
-        obj.comment = COMMENT_REACTIVATED
         obj.editor = self.request.user
+        obj.comment = ""
         obj.save_with_version()
 
         if settings.SEND_EMAIL:
             send_notification_admin_request(obj)
 
-        messages.success(
-            self.request, MSG_REQUEST_SUCCESS.format(MSG_PART_REACTIVATED, MSG_PART_GROUP_CREATION)
-        )
-        return HttpResponseRedirect(
-            reverse(
-                "usersec:hpcgroupcreaterequest-detail",
-                kwargs={"hpcgroupcreaterequest": obj.uuid},
-            )
-        )
+        return HttpResponseRedirect(reverse("home"))
 
 
 class HpcGroupCreateRequestDeleteView(HpcPermissionMixin, DeleteView):
@@ -365,6 +339,23 @@ def get_success_url(self):
         return reverse("home")
 
 
+class HpcGroupCreateRequestArchiveView(HpcPermissionMixin, SingleObjectMixin, View):
+    """HPC user change request archive view."""
+
+    model = HpcGroupCreateRequest
+    slug_field = "uuid"
+    slug_url_kwarg = "hpcgroupcreaterequest"
+    permission_required = "usersec.manage_hpcgroupcreaterequest"
+
+    def get(self, request, *args, **kwargs):
+        obj = self.get_object()
+        obj.status = REQUEST_STATUS_ARCHIVED
+        obj.editor = self.request.user
+        obj.save_with_version()
+
+        return HttpResponseRedirect(reverse("home"))
+
+
 class HpcUserView(HpcPermissionMixin, DetailView):
     """HPC user overview."""
 
@@ -434,9 +425,16 @@ def get_requests_by_status(status):
             context["hpcgroupdeleterequests"] = None
             context["hpcuserdeleterequests"] = None
             context["hpcprojectdeleterequests"] = None
-            context["pending_requests"] = get_requests_by_status(REQUEST_STATUS_ACTIVE)
-            context["revision_requests"] = get_requests_by_status(REQUEST_STATUS_REVISION)
-            context["retracted_requests"] = get_requests_by_status(REQUEST_STATUS_RETRACTED)
+            context["requests"] = list(
+                chain(
+                    get_requests_by_status(REQUEST_STATUS_ACTIVE),
+                    get_requests_by_status(REQUEST_STATUS_REVISED),
+                    get_requests_by_status(REQUEST_STATUS_REVISION),
+                    get_requests_by_status(REQUEST_STATUS_RETRACTED),
+                    get_requests_by_status(REQUEST_STATUS_APPROVED),
+                    get_requests_by_status(REQUEST_STATUS_DENIED),
+                )
+            )
             context["has_pending_group_change_request"] = HpcGroupChangeRequest.objects.filter(
                 group=group, status=REQUEST_STATUS_ACTIVE
             ).exists()
@@ -458,19 +456,14 @@ def get_requests_by_status(status):
             context["pending_requests"] += list(
                 HpcProjectChangeRequest.objects.filter(
                     Q(project__group=group) | Q(project__delegate=context["object"]),
-                    status=REQUEST_STATUS_ACTIVE,
-                )
-            )
-            context["revision_requests"] += list(
-                HpcProjectChangeRequest.objects.filter(
-                    Q(project__group=group) | Q(project__delegate=context["object"]),
-                    status=REQUEST_STATUS_REVISION,
-                )
-            )
-            context["retracted_requests"] += list(
-                HpcProjectChangeRequest.objects.filter(
-                    Q(project__group=group) | Q(project__delegate=context["object"]),
-                    status=REQUEST_STATUS_RETRACTED,
+                    status__in=(
+                        REQUEST_STATUS_ACTIVE,
+                        REQUEST_STATUS_REVISION,
+                        REQUEST_STATUS_REVISED,
+                        REQUEST_STATUS_RETRACTED,
+                        REQUEST_STATUS_APPROVED,
+                        REQUEST_STATUS_DENIED,
+                    ),
                 )
             )
             projects_available |= context["object"].hpcproject_delegate.exists()
@@ -551,9 +544,6 @@ def form_valid(self, form):
         if settings.SEND_EMAIL:
             send_notification_admin_request(obj)
 
-        messages.success(
-            self.request, MSG_REQUEST_FAILURE.format(MSG_PART_SUBMITTED, MSG_PART_USER_CREATION)
-        )
         return HttpResponseRedirect(reverse("home"))
 
 
@@ -576,6 +566,7 @@ def get_context_data(self, **kwargs):
         context["is_active"] = obj.is_active()
         context["is_revision"] = obj.is_revision()
         context["is_revised"] = obj.is_revised()
+        context["is_archived"] = obj.is_archived()
         return context
 
 
@@ -630,31 +621,23 @@ def form_valid(self, form):
         if settings.SEND_EMAIL:
             send_notification_admin_request(obj)
 
-        messages.success(
-            self.request, MSG_REQUEST_SUCCESS.format(MSG_PART_UPDATED, MSG_PART_USER_CREATION)
-        )
         return HttpResponseRedirect(self.get_success_url())
 
 
-class HpcUserCreateRequestRetractView(HpcPermissionMixin, DeleteView):
+class HpcUserCreateRequestRetractView(HpcPermissionMixin, SingleObjectMixin, View):
     """HPC user create request update view."""
 
-    template_name_suffix = "_retract_confirm"
     model = HpcUserCreateRequest
     slug_field = "uuid"
     slug_url_kwarg = "hpcusercreaterequest"
     permission_required = "usersec.manage_hpcusercreaterequest"
 
-    def post(self, request, *args, **kwargs):
+    def get(self, request, *args, **kwargs):
         obj = self.get_object()
-        obj.comment = COMMENT_RETRACTED
         obj.editor = self.request.user
+        obj.comment = ""
         obj.retract_with_version()
 
-        # No email notification required
-        messages.success(
-            self.request, MSG_REQUEST_SUCCESS.format(MSG_PART_RETRACTED, MSG_PART_USER_CREATION)
-        )
         return HttpResponseRedirect(
             reverse(
                 "usersec:hpcusercreaterequest-detail",
@@ -674,22 +657,14 @@ class HpcUserCreateRequestReactivateView(HpcPermissionMixin, SingleObjectMixin,
     def get(self, request, *args, **kwargs):
         obj = self.get_object()
         obj.status = REQUEST_STATUS_ACTIVE
-        obj.comment = COMMENT_REACTIVATED
         obj.editor = self.request.user
+        obj.comment = ""
         obj.save_with_version()
 
         if settings.SEND_EMAIL:
             send_notification_admin_request(obj)
 
-        messages.success(
-            self.request, MSG_REQUEST_SUCCESS.format(MSG_PART_REACTIVATED, MSG_PART_USER_CREATION)
-        )
-        return HttpResponseRedirect(
-            reverse(
-                "usersec:hpcusercreaterequest-detail",
-                kwargs={"hpcusercreaterequest": obj.uuid},
-            )
-        )
+        return HttpResponseRedirect(reverse("home"))
 
 
 class HpcUserCreateRequestDeleteView(HpcPermissionMixin, DeleteView):
@@ -702,12 +677,26 @@ class HpcUserCreateRequestDeleteView(HpcPermissionMixin, DeleteView):
     permission_required = "usersec.manage_hpcusercreaterequest"
 
     def get_success_url(self):
-        messages.success(
-            self.request, MSG_REQUEST_SUCCESS.format(MSG_PART_DELETED, MSG_PART_USER_CREATION)
-        )
         return reverse("home")
 
 
+class HpcUserCreateRequestArchiveView(HpcPermissionMixin, SingleObjectMixin, View):
+    """HPC user create request archive view."""
+
+    model = HpcUserCreateRequest
+    slug_field = "uuid"
+    slug_url_kwarg = "hpcusercreaterequest"
+    permission_required = "usersec.manage_hpcusercreaterequest"
+
+    def get(self, request, *args, **kwargs):
+        obj = self.get_object()
+        obj.status = REQUEST_STATUS_ARCHIVED
+        obj.editor = self.request.user
+        obj.save_with_version()
+
+        return HttpResponseRedirect(reverse("home"))
+
+
 class HpcGroupDeleteRequestCreateView(View):
     pass
 
@@ -732,6 +721,10 @@ class HpcGroupDeleteRequestDeleteView(View):
     pass
 
 
+class HpcGroupDeleteRequestArchiveView(View):
+    pass
+
+
 class HpcGroupChangeRequestCreateView(HpcPermissionMixin, CreateView):
     """HPC group change request create view.
 
@@ -767,6 +760,21 @@ def get_context_data(self, **kwargs):
         context.update({"group": self.get_object()})
         return context
 
+    def get(self, request, *args, **kwargs):
+        if HpcGroupChangeRequest.objects.filter(
+            group=self.get_object(),
+            status__in=(
+                REQUEST_STATUS_ACTIVE,
+                REQUEST_STATUS_REVISION,
+                REQUEST_STATUS_RETRACTED,
+                REQUEST_STATUS_REVISED,
+            ),
+        ).exists():
+            messages.error(request, "There already exists an ongoing request to create the group.")
+            return HttpResponseRedirect(reverse("home"))
+
+        return super().get(request, *args, **kwargs)
+
     def form_valid(self, form):
         obj = form.save(commit=False)
         obj.requester = self.request.user
@@ -786,9 +794,6 @@ def form_valid(self, form):
         if settings.SEND_EMAIL:
             send_notification_admin_request(obj)
 
-        messages.success(
-            self.request, MSG_REQUEST_SUCCESS.format(MSG_PART_SUBMITTED, MSG_PART_GROUP_UPDATE)
-        )
         return HttpResponseRedirect(
             reverse(
                 "usersec:hpcgroupchangerequest-detail",
@@ -816,6 +821,7 @@ def get_context_data(self, **kwargs):
         context["is_active"] = obj.is_active()
         context["is_revision"] = obj.is_revision()
         context["is_revised"] = obj.is_revised()
+        context["is_archived"] = obj.is_archived()
         return context
 
 
@@ -867,32 +873,23 @@ def form_valid(self, form):
             )
             return HttpResponseRedirect(reverse("home"))
 
-        # No email notification required
-        messages.success(
-            self.request, MSG_REQUEST_SUCCESS.format(MSG_PART_UPDATED, MSG_PART_GROUP_UPDATE)
-        )
         return HttpResponseRedirect(self.get_success_url())
 
 
-class HpcGroupChangeRequestRetractView(HpcPermissionMixin, DeleteView):
+class HpcGroupChangeRequestRetractView(HpcPermissionMixin, SingleObjectMixin, View):
     """HPC group change request retract view."""
 
-    template_name_suffix = "_retract_confirm"
     model = HpcGroupChangeRequest
     slug_field = "uuid"
     slug_url_kwarg = "hpcgroupchangerequest"
     permission_required = "usersec.manage_hpcgroupchangerequest"
 
-    def post(self, request, *args, **kwargs):
+    def get(self, request, *args, **kwargs):
         obj = self.get_object()
-        obj.comment = COMMENT_RETRACTED
         obj.editor = self.request.user
+        obj.comment = ""
         obj.retract_with_version()
 
-        # No email notification required
-        messages.success(
-            self.request, MSG_REQUEST_SUCCESS.format(MSG_PART_RETRACTED, MSG_PART_GROUP_UPDATE)
-        )
         return HttpResponseRedirect(
             reverse(
                 "usersec:hpcgroupchangerequest-detail",
@@ -912,22 +909,14 @@ class HpcGroupChangeRequestReactivateView(HpcPermissionMixin, SingleObjectMixin,
     def get(self, request, *args, **kwargs):
         obj = self.get_object()
         obj.status = REQUEST_STATUS_ACTIVE
-        obj.comment = COMMENT_REACTIVATED
         obj.editor = self.request.user
+        obj.comment = ""
         obj.save_with_version()
 
         if settings.SEND_EMAIL:
             send_notification_admin_request(obj)
 
-        messages.success(
-            self.request, MSG_REQUEST_SUCCESS.format(MSG_PART_REACTIVATED, MSG_PART_GROUP_UPDATE)
-        )
-        return HttpResponseRedirect(
-            reverse(
-                "usersec:hpcgroupchangerequest-detail",
-                kwargs={"hpcgroupchangerequest": obj.uuid},
-            )
-        )
+        return HttpResponseRedirect(reverse("home"))
 
 
 class HpcGroupChangeRequestDeleteView(HpcPermissionMixin, DeleteView):
@@ -940,12 +929,26 @@ class HpcGroupChangeRequestDeleteView(HpcPermissionMixin, DeleteView):
     permission_required = "usersec.manage_hpcgroupchangerequest"
 
     def get_success_url(self):
-        messages.success(
-            self.request, MSG_REQUEST_SUCCESS.format(MSG_PART_DELETED, MSG_PART_GROUP_UPDATE)
-        )
         return reverse("home")
 
 
+class HpcGroupChangeRequestArchiveView(HpcPermissionMixin, SingleObjectMixin, View):
+    """HPC group change request archive view."""
+
+    model = HpcGroupChangeRequest
+    slug_field = "uuid"
+    slug_url_kwarg = "hpcgroupchangerequest"
+    permission_required = "usersec.manage_hpcgroupchangerequest"
+
+    def get(self, request, *args, **kwargs):
+        obj = self.get_object()
+        obj.status = REQUEST_STATUS_ARCHIVED
+        obj.editor = self.request.user
+        obj.save_with_version()
+
+        return HttpResponseRedirect(reverse("home"))
+
+
 class HpcUserDeleteRequestCreateView(View):
     pass
 
@@ -970,6 +973,10 @@ class HpcUserDeleteRequestDeleteView(View):
     pass
 
 
+class HpcUserDeleteRequestArchiveView(View):
+    pass
+
+
 class HpcUserChangeRequestCreateView(HpcPermissionMixin, CreateView):
     """HPC user change request create view.
 
@@ -1022,9 +1029,6 @@ def form_valid(self, form):
         if settings.SEND_EMAIL:
             send_notification_admin_request(obj)
 
-        messages.success(
-            self.request, MSG_REQUEST_SUCCESS.format(MSG_PART_SUBMITTED, MSG_PART_USER_UPDATE)
-        )
         return HttpResponseRedirect(
             reverse(
                 "usersec:hpcuserchangerequest-detail",
@@ -1052,6 +1056,7 @@ def get_context_data(self, **kwargs):
         context["is_active"] = obj.is_active()
         context["is_revision"] = obj.is_revision()
         context["is_revised"] = obj.is_revised()
+        context["is_archived"] = obj.is_archived()
         return context
 
 
@@ -1103,32 +1108,23 @@ def form_valid(self, form):
             )
             return HttpResponseRedirect(reverse("home"))
 
-        # No email notification required
-        messages.success(
-            self.request, MSG_REQUEST_SUCCESS.format(MSG_PART_UPDATED, MSG_PART_USER_UPDATE)
-        )
         return HttpResponseRedirect(self.get_success_url())
 
 
-class HpcUserChangeRequestRetractView(HpcPermissionMixin, DeleteView):
+class HpcUserChangeRequestRetractView(HpcPermissionMixin, SingleObjectMixin, View):
     """HPC user change request update view."""
 
-    template_name_suffix = "_retract_confirm"
     model = HpcUserChangeRequest
     slug_field = "uuid"
     slug_url_kwarg = "hpcuserchangerequest"
     permission_required = "usersec.manage_hpcuserchangerequest"
 
-    def post(self, request, *args, **kwargs):
+    def get(self, request, *args, **kwargs):
         obj = self.get_object()
-        obj.comment = COMMENT_RETRACTED
         obj.editor = self.request.user
+        obj.comment = ""
         obj.retract_with_version()
 
-        # No email notification required
-        messages.success(
-            self.request, MSG_REQUEST_SUCCESS.format(MSG_PART_RETRACTED, MSG_PART_USER_UPDATE)
-        )
         return HttpResponseRedirect(
             reverse(
                 "usersec:hpcuserchangerequest-detail",
@@ -1148,22 +1144,14 @@ class HpcUserChangeRequestReactivateView(HpcPermissionMixin, SingleObjectMixin,
     def get(self, request, *args, **kwargs):
         obj = self.get_object()
         obj.status = REQUEST_STATUS_ACTIVE
-        obj.comment = COMMENT_REACTIVATED
         obj.editor = self.request.user
+        obj.comment = ""
         obj.save_with_version()
 
         if settings.SEND_EMAIL:
             send_notification_admin_request(obj)
 
-        messages.success(
-            self.request, MSG_REQUEST_SUCCESS.format(MSG_PART_REACTIVATED, MSG_PART_USER_UPDATE)
-        )
-        return HttpResponseRedirect(
-            reverse(
-                "usersec:hpcuserchangerequest-detail",
-                kwargs={"hpcuserchangerequest": obj.uuid},
-            )
-        )
+        return HttpResponseRedirect(reverse("home"))
 
 
 class HpcUserChangeRequestDeleteView(HpcPermissionMixin, DeleteView):
@@ -1176,12 +1164,26 @@ class HpcUserChangeRequestDeleteView(HpcPermissionMixin, DeleteView):
     permission_required = "usersec.manage_hpcuserchangerequest"
 
     def get_success_url(self):
-        messages.success(
-            self.request, MSG_REQUEST_SUCCESS.format(MSG_PART_DELETED, MSG_PART_USER_UPDATE)
-        )
         return reverse("home")
 
 
+class HpcUserChangeRequestArchiveView(HpcPermissionMixin, SingleObjectMixin, View):
+    """HPC user change request archive view."""
+
+    model = HpcUserChangeRequest
+    slug_field = "uuid"
+    slug_url_kwarg = "hpcuserchangerequest"
+    permission_required = "usersec.manage_hpcuserchangerequest"
+
+    def get(self, request, *args, **kwargs):
+        obj = self.get_object()
+        obj.status = REQUEST_STATUS_ARCHIVED
+        obj.editor = self.request.user
+        obj.save_with_version()
+
+        return HttpResponseRedirect(reverse("home"))
+
+
 class HpcProjectDetailView(HpcPermissionMixin, DetailView):
     """HPC project detail view."""
 
@@ -1224,7 +1226,7 @@ def get_form_kwargs(self):
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
-        context.update({"group": self.get_object()})
+        context.update({"owner_id": self.get_object().owner.id})
         return context
 
     def form_valid(self, form):
@@ -1251,9 +1253,6 @@ def form_valid(self, form):
             send_notification_admin_request(obj)
             send_notification_manager_project_request(obj)
 
-        messages.success(
-            self.request, MSG_REQUEST_SUCCESS.format(MSG_PART_SUBMITTED, MSG_PART_PROJECT_CREATION)
-        )
         return HttpResponseRedirect(
             reverse(
                 "usersec:hpcprojectcreaterequest-detail",
@@ -1281,6 +1280,7 @@ def get_context_data(self, **kwargs):
         context["is_active"] = obj.is_active()
         context["is_revision"] = obj.is_revision()
         context["is_revised"] = obj.is_revised()
+        context["is_archived"] = obj.is_archived()
         return context
 
 
@@ -1297,6 +1297,7 @@ class HpcProjectCreateRequestUpdateView(HpcPermissionMixin, UpdateView):
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         context["update"] = True
+        context["owner_id"] = self.get_object().group.owner.id
         return context
 
     def get_form_kwargs(self):
@@ -1335,33 +1336,23 @@ def form_valid(self, form):
         obj.members.set(form.cleaned_data["members"])
         obj.version_history.last().members.set(form.cleaned_data["members"])
 
-        # No email notification required
-        messages.success(
-            self.request, MSG_REQUEST_SUCCESS.format(MSG_PART_UPDATED, MSG_PART_PROJECT_CREATION)
-        )
         return HttpResponseRedirect(self.get_success_url())
 
 
-class HpcProjectCreateRequestRetractView(HpcPermissionMixin, DeleteView):
+class HpcProjectCreateRequestRetractView(HpcPermissionMixin, SingleObjectMixin, View):
     """HPC project create request update view."""
 
-    template_name_suffix = "_retract_confirm"
     model = HpcProjectCreateRequest
     slug_field = "uuid"
     slug_url_kwarg = "hpcprojectcreaterequest"
     permission_required = "usersec.manage_hpcprojectcreaterequest"
 
-    def post(self, request, *args, **kwargs):
+    def get(self, request, *args, **kwargs):
         obj = self.get_object()
-        obj.comment = COMMENT_RETRACTED
         obj.editor = self.request.user
+        obj.comment = ""
         obj.retract_with_version()
 
-        # No email notification required
-        messages.success(
-            self.request, MSG_REQUEST_SUCCESS.format(MSG_PART_RETRACTED, MSG_PART_PROJECT_CREATION)
-        )
-
         return HttpResponseRedirect(
             reverse(
                 "usersec:hpcprojectcreaterequest-detail",
@@ -1381,23 +1372,14 @@ class HpcProjectCreateRequestReactivateView(HpcPermissionMixin, SingleObjectMixi
     def get(self, request, *args, **kwargs):
         obj = self.get_object()
         obj.status = REQUEST_STATUS_ACTIVE
-        obj.comment = COMMENT_REACTIVATED
         obj.editor = self.request.user
+        obj.comment = ""
         obj.save_with_version()
 
         if settings.SEND_EMAIL:
             send_notification_admin_request(obj)
 
-        messages.success(
-            self.request,
-            MSG_REQUEST_SUCCESS.format(MSG_PART_REACTIVATED, MSG_PART_PROJECT_CREATION),
-        )
-        return HttpResponseRedirect(
-            reverse(
-                "usersec:hpcprojectcreaterequest-detail",
-                kwargs={"hpcprojectcreaterequest": obj.uuid},
-            )
-        )
+        return HttpResponseRedirect(reverse("home"))
 
 
 class HpcProjectCreateRequestDeleteView(HpcPermissionMixin, DeleteView):
@@ -1410,12 +1392,26 @@ class HpcProjectCreateRequestDeleteView(HpcPermissionMixin, DeleteView):
     permission_required = "usersec.manage_hpcprojectcreaterequest"
 
     def get_success_url(self):
-        messages.success(
-            self.request, MSG_REQUEST_SUCCESS.format(MSG_PART_DELETED, MSG_PART_PROJECT_CREATION)
-        )
         return reverse("home")
 
 
+class HpcProjectCreateRequestArchiveView(HpcPermissionMixin, SingleObjectMixin, View):
+    """HPC project create request archive view."""
+
+    model = HpcProjectCreateRequest
+    slug_field = "uuid"
+    slug_url_kwarg = "hpcprojectcreaterequest"
+    permission_required = "usersec.manage_hpcprojectcreaterequest"
+
+    def get(self, request, *args, **kwargs):
+        obj = self.get_object()
+        obj.status = REQUEST_STATUS_ARCHIVED
+        obj.editor = self.request.user
+        obj.save_with_version()
+
+        return HttpResponseRedirect(reverse("home"))
+
+
 class HpcProjectDeleteRequestCreateView(View):
     pass
 
@@ -1440,6 +1436,10 @@ class HpcProjectDeleteRequestDeleteView(View):
     pass
 
 
+class HpcProjectDeleteRequestArchiveView(View):
+    pass
+
+
 class HpcProjectChangeRequestCreateView(HpcPermissionMixin, CreateView):
     """HPC project create request create view.
 
@@ -1450,7 +1450,7 @@ class HpcProjectChangeRequestCreateView(HpcPermissionMixin, CreateView):
     # Required for permission checks, usually the CreateView doesn't have the current object
     # available
     model = HpcProject
-    template_name = "usersec/hpcprojectchangerequest_form.html"
+    template_name = "usersec/hpcprojectcreaterequest_form.html"
     slug_field = "uuid"
     slug_url_kwarg = "hpcproject"
     # Check permission based on HpcProject object
@@ -1472,7 +1472,7 @@ def get_form_kwargs(self):
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
-        context.update({"project": self.get_object()})
+        context["owner_id"] = self.get_object().group.owner.id
         return context
 
     def form_valid(self, form):
@@ -1498,9 +1498,6 @@ def form_valid(self, form):
         if settings.SEND_EMAIL:
             send_notification_admin_request(obj)
 
-        messages.success(
-            self.request, MSG_REQUEST_SUCCESS.format(MSG_PART_SUBMITTED, MSG_PART_PROJECT_UPDATE)
-        )
         return HttpResponseRedirect(
             reverse(
                 "usersec:hpcprojectchangerequest-detail",
@@ -1528,13 +1525,14 @@ def get_context_data(self, **kwargs):
         context["is_active"] = obj.is_active()
         context["is_revision"] = obj.is_revision()
         context["is_revised"] = obj.is_revised()
+        context["is_archived"] = obj.is_archived()
         return context
 
 
 class HpcProjectChangeRequestUpdateView(HpcPermissionMixin, UpdateView):
     """HPC project change request update view."""
 
-    template_name = "usersec/hpcprojectchangerequest_form.html"
+    template_name = "usersec/hpcprojectcreaterequest_form.html"
     form_class = HpcProjectChangeRequestForm
     model = HpcProjectChangeRequest
     slug_field = "uuid"
@@ -1544,7 +1542,7 @@ class HpcProjectChangeRequestUpdateView(HpcPermissionMixin, UpdateView):
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         context["update"] = True
-        context["project"] = self.get_object().project
+        context["owner_id"] = self.get_object().project.group.owner.id
         return context
 
     def get_form_kwargs(self):
@@ -1579,32 +1577,23 @@ def form_valid(self, form):
             )
             return HttpResponseRedirect(reverse("home"))
 
-        # No email notification required
-        messages.success(
-            self.request, MSG_REQUEST_SUCCESS.format(MSG_PART_UPDATED, MSG_PART_PROJECT_UPDATE)
-        )
         return HttpResponseRedirect(self.get_success_url())
 
 
-class HpcProjectChangeRequestRetractView(HpcPermissionMixin, DeleteView):
+class HpcProjectChangeRequestRetractView(HpcPermissionMixin, SingleObjectMixin, View):
     """HPC project change request retract view."""
 
-    template_name_suffix = "_retract_confirm"
     model = HpcProjectChangeRequest
     slug_field = "uuid"
     slug_url_kwarg = "hpcprojectchangerequest"
     permission_required = "usersec.manage_hpcprojectchangerequest"
 
-    def post(self, request, *args, **kwargs):
+    def get(self, request, *args, **kwargs):
         obj = self.get_object()
-        obj.comment = COMMENT_RETRACTED
         obj.editor = self.request.user
+        obj.comment = ""
         obj.retract_with_version()
 
-        # No email notification required
-        messages.success(
-            self.request, MSG_REQUEST_SUCCESS.format(MSG_PART_RETRACTED, MSG_PART_PROJECT_UPDATE)
-        )
         return HttpResponseRedirect(
             reverse(
                 "usersec:hpcprojectchangerequest-detail",
@@ -1624,22 +1613,14 @@ class HpcProjectChangeRequestReactivateView(HpcPermissionMixin, SingleObjectMixi
     def get(self, request, *args, **kwargs):
         obj = self.get_object()
         obj.status = REQUEST_STATUS_ACTIVE
-        obj.comment = COMMENT_REACTIVATED
         obj.editor = self.request.user
+        obj.comment = ""
         obj.save_with_version()
 
         if settings.SEND_EMAIL:
             send_notification_admin_request(obj)
 
-        messages.success(
-            self.request, MSG_REQUEST_SUCCESS.format(MSG_PART_REACTIVATED, MSG_PART_PROJECT_UPDATE)
-        )
-        return HttpResponseRedirect(
-            reverse(
-                "usersec:hpcprojectchangerequest-detail",
-                kwargs={"hpcprojectchangerequest": obj.uuid},
-            )
-        )
+        return HttpResponseRedirect(reverse("home"))
 
 
 class HpcProjectChangeRequestDeleteView(HpcPermissionMixin, DeleteView):
@@ -1652,12 +1633,26 @@ class HpcProjectChangeRequestDeleteView(HpcPermissionMixin, DeleteView):
     permission_required = "usersec.manage_hpcprojectchangerequest"
 
     def get_success_url(self):
-        messages.success(
-            self.request, MSG_REQUEST_SUCCESS.format(MSG_PART_DELETED, MSG_PART_PROJECT_UPDATE)
-        )
         return reverse("home")
 
 
+class HpcProjectChangeRequestArchiveView(HpcPermissionMixin, SingleObjectMixin, View):
+    """HPC project change request archive view."""
+
+    model = HpcProjectChangeRequest
+    slug_field = "uuid"
+    slug_url_kwarg = "hpcprojectchangerequest"
+    permission_required = "usersec.manage_hpcprojectchangerequest"
+
+    def get(self, request, *args, **kwargs):
+        obj = self.get_object()
+        obj.status = REQUEST_STATUS_ARCHIVED
+        obj.editor = self.request.user
+        obj.save_with_version()
+
+        return HttpResponseRedirect(reverse("home"))
+
+
 class HpcGroupInvitationDetailView(HpcPermissionMixin, DetailView):
     """HPC group invitation detail view."""
 
@@ -1728,7 +1723,6 @@ def get(self, request, *args, **kwargs):
             send_notification_manager_user_decided_invitation(obj)
             send_notification_user_welcome_mail(hpcuser)
 
-        messages.success(request, MSG_INVITATION_GROUP_USER_CREATE_SUCCESS)
         return HttpResponseRedirect(
             reverse(
                 "usersec:hpcuser-overview",
@@ -1753,7 +1747,6 @@ def post(self, request, *args, **kwargs):
         if settings.SEND_EMAIL:
             send_notification_manager_user_decided_invitation(obj)
 
-        messages.success(request, MSG_INVITATION_REJECTED_SUCCESS)
         return HttpResponseRedirect(
             reverse(
                 "usersec:hpcgroupinvitation-detail",
@@ -1801,7 +1794,6 @@ def get(self, request, *args, **kwargs):
         if settings.SEND_EMAIL:
             send_notification_manager_user_decided_invitation(obj)
 
-        messages.success(request, MSG_INVITATION_PROJECT_USER_ADD_SUCCESS)
         return HttpResponseRedirect(
             reverse(
                 "usersec:hpcuser-overview",
@@ -1826,7 +1818,6 @@ def post(self, request, *args, **kwargs):
         if settings.SEND_EMAIL:
             send_notification_manager_user_decided_invitation(obj)
 
-        messages.success(self.request, MSG_INVITATION_REJECTED_SUCCESS)
         return HttpResponseRedirect(
             reverse(
                 "usersec:hpcuser-overview",
@@ -1857,5 +1848,4 @@ def post(self, request, *args, **kwargs):
         request.user.consented_to_terms = True
         request.user.save()
 
-        messages.success(self.request, MSG_TERMS_CONSENT)
         return HttpResponseRedirect(reverse("home"))