diff --git a/core/static/bundled/base-bundle-index.ts b/core/static/bundled/base-bundle-index.ts
index 3c7140e1..3434c8f2 100644
--- a/core/static/bundled/base-bundle-index.ts
+++ b/core/static/bundled/base-bundle-index.ts
@@ -7,7 +7,7 @@
  */
 
 // Must be loaded before Apline
-import htmx, { HtmxResponse } from "htmx.org";
+import htmx from "htmx.org";
 import "htmx.org/dist/ext/hx-alpine-compat.js";
 import "htmx.org/dist/ext/hx-prompt.js";
 import "htmx.org/dist/ext/hx-download.js";
@@ -48,13 +48,20 @@ polyfillCountryFlagEmojis();
 /**
  * HTMX
  */
-document.body.addEventListener("htmx:before:request", (event) => {
-  event.target.ariaBusy = true;
+htmx.registerExtension("aria-busy", {
+  // biome-ignore lint/style/useNamingConvention: api's name
+  // biome-ignore lint/suspicious/noExplicitAny: no type hint
+  htmx_before_request: (_: HTMLElement, detail: any) => {
+    detail.ctx.target.ariaBusy = "true";
+  },
+  // biome-ignore lint/style/useNamingConvention: api's name
+  // biome-ignore lint/suspicious/noExplicitAny: no type hint
+  htmx_before_swap: (elt: HTMLElement, detail: any) => {
+    detail.ctx.target.ariaBusy = "null";
+  },
 });
 
-document.body.addEventListener("htmx:before:swap", (event) => {
-  event.target.ariaBusy = null;
-});
+htmx.config.transitions = true;
 
 Object.assign(window, { htmx });
 
diff --git a/pedagogy/static/pedagogy/css/pedagogy.scss b/pedagogy/static/pedagogy/css/pedagogy.scss
index a177ee4e..ca7cc368 100644
--- a/pedagogy/static/pedagogy/css/pedagogy.scss
+++ b/pedagogy/static/pedagogy/css/pedagogy.scss
@@ -69,6 +69,7 @@ $pedagogy-white-text: #f0f0f0;
       input[type="checkbox"] {
         display: none;
       }
+
       margin-top: 10px;
       margin-bottom: 0;
       color: white;
@@ -399,6 +400,7 @@ $pedagogy-white-text: #f0f0f0;
 
           a {
             color: $pedagogy-white-text;
+            cursor: pointer;
           }
 
           a:hover {
@@ -442,7 +444,8 @@ details.accordion>.accordion-content {
   border-right: none;
 }
 
-.right {
+.buttons {
   display: flex;
   justify-content: flex-end;
+  align-items: center;
 }
\ No newline at end of file
diff --git a/pedagogy/templates/pedagogy/fragments/comment_report.jinja b/pedagogy/templates/pedagogy/fragments/comment_report.jinja
index d729f545..39f9e6f6 100644
--- a/pedagogy/templates/pedagogy/fragments/comment_report.jinja
+++ b/pedagogy/templates/pedagogy/fragments/comment_report.jinja
@@ -1,11 +1,10 @@
 <form
+  class="report-form"
   hx-post="{{ request.get_full_path() }}"
-  hx-ext="error-callbacks"
   hx-target="this"
   hx-swap="outerHTML"
-  hx-disabled-elt="input[type='submit']"
+  hx-disable="button input[type='submit']"
   hx-trigger="submit"
-  hx-callback-404="target.remove()"
 >
   {% csrf_token %}
   {{ form.non_field_errors() }}
@@ -16,15 +15,17 @@
   {{ form.reporter }}
   {{ form.comment }}
 
-  <button
-    hx-get="{{ url('pedagogy:comment_detail', comment_id=comment_id) }}"
-    hx-target="closest form"
-    hx-swap="outerHTML"
-  >
-    {% trans %}Cancel{% endtrans %}
-  </button>
+  <div class="buttons">
+    <button
+      class="btn btn-red left"
+      hx-get="{{ ue_detail_url }}"
+      hx-target="closest form"
+      hx-swap="outerHTML"
+    >
+      {% trans %}Cancel{% endtrans %}
+    </button>
 
-  <p class="right" id="nique">
-    <input type="submit" value="{% trans %}Report{% endtrans %}" />
-  </p>
+    <input class="btn btn-green" type="submit" value="{% trans %}Report{% endtrans %}" />
+
+  </div>
 </form>
\ No newline at end of file
diff --git a/pedagogy/templates/pedagogy/fragments/ue_comment.jinja b/pedagogy/templates/pedagogy/fragments/ue_comment.jinja
deleted file mode 100644
index 3a4e5cd6..00000000
--- a/pedagogy/templates/pedagogy/fragments/ue_comment.jinja
+++ /dev/null
@@ -1,83 +0,0 @@
-{% from "pedagogy/macros.jinja" import display_star %}
-{% from "core/macros.jinja" import user_profile_link %}
-
-<div id="comment-{{ comment.id }}" class="comment-container">
-
-  <div class="grade-block">
-    <div class="grade-type">
-      <p>{% trans %}Global grade{% endtrans %}</p>
-      <p>{% trans %}Utility{% endtrans %}</p>
-      <p>{% trans %}Interest{% endtrans %}</p>
-      <p>{% trans %}Teaching{% endtrans %}</p>
-      <p>{% trans %}Work load{% endtrans %}</p>
-    </div>
-    <div class="grade-stars">
-      <p>{{ display_star(comment.grade_global) }}</p>
-      <p>{{ display_star(comment.grade_utility) }}</p>
-      <p>{{ display_star(comment.grade_interest) }}</p>
-      <p>{{ display_star(comment.grade_teaching) }}</p>
-      <p>{{ display_star(comment.grade_work_load) }}</p>
-    </div>
-    <div class="grade-extension"></div>
-  </div>
-
-  <div class="comment">
-    <div class="anchor">
-      <a href="{{ url('pedagogy:ue_detail', ue_id=ue.id) }}#comment-{{ comment.id }}"><i class="fa fa-paragraph"></i></a>
-    </div>
-    {{ comment.comment|markdown }}
-  </div>
-
-  <div class="info">
-    {% if comment.is_reported %}
-      <p class="status-reported">
-        {% trans %}This comment has been reported{% endtrans %}
-      </p>
-    {% endif %}
-
-    {% if comment.author_id == user.id or user.has_perm("pedagogy.change_comment") %}
-      <button
-        class="btn btn-orange action"
-        hx-get="{{ url('pedagogy:comment_update', comment_id=comment.id) }}"
-        hx-swap="outerHTML"
-        hx-target="#comment-{{ comment.id }}"
-      >
-        <i class="fa fa-pencil"></i> {% trans %}Edit{% endtrans %}
-      </button>
-    {% endif %}
-    {% if comment.author_id == user.id or user.has_perm("pedagogy.delete_comment") %}
-      <form class="action"
-            hx-ext="error-callbacks"
-            hx-post="{{ url('pedagogy:comment_delete', comment_id=comment.id) }}"
-            hx-confirm='{% trans obj=object %}Are you sure you want to delete "{{ obj }}"?{% endtrans %}'
-            hx-swap="outerHTML"
-            hx-target="#comment-{{ comment.id }}"
-            hx-callback-404="document.getElementsByTagName('body')[0].dispatchEvent(new CustomEvent('CommentUpdate'));target.remove()"
-      >
-        {% csrf_token %}
-        <button class="btn btn-red action">
-          <i class="fa fa-trash-can"></i> {% trans %}Delete{% endtrans %}
-        </button>
-      </form>
-    {% endif %}
-  </div>
-
-  <div class="comment-end-bar">
-    <div class="report">
-      <p>
-        <a
-          hx-get="{{ url('pedagogy:comment_report', comment_id=comment.id) }}"
-          hx-swap="outerHTML"
-          hx-target="#comment-{{ comment.id }}"
-        >
-          {% trans %}Report this comment{% endtrans %}
-        </a>
-      </p>
-    </div>
-
-    <div class="date"><p>{{ comment.publish_date.strftime('%d/%m/%Y') }}</p></div>
-
-    <div class="author"><p>{{ user_profile_link(comment.author) }}</p></div>
-  </div>
-
-</div>
\ No newline at end of file
diff --git a/pedagogy/templates/pedagogy/fragments/ue_comment_form.jinja b/pedagogy/templates/pedagogy/fragments/ue_comment_form.jinja
index ac5968d8..7ec115be 100644
--- a/pedagogy/templates/pedagogy/fragments/ue_comment_form.jinja
+++ b/pedagogy/templates/pedagogy/fragments/ue_comment_form.jinja
@@ -56,9 +56,9 @@
         {{ form.comment }}
       </div>
     </div>
-    <p class="right">
+    <div class="buttons">
       <input type="submit" value="{% trans %}Comment{% endtrans %}" />
-    </p>
+    </div>
   </form>
 
   {% if form.is_creation %}
diff --git a/pedagogy/templates/pedagogy/fragments/ue_details/comments.jinja b/pedagogy/templates/pedagogy/fragments/ue_details/comments.jinja
index fdc0e53c..04aee21a 100644
--- a/pedagogy/templates/pedagogy/fragments/ue_details/comments.jinja
+++ b/pedagogy/templates/pedagogy/fragments/ue_details/comments.jinja
@@ -1,3 +1,6 @@
+{% from "pedagogy/macros.jinja" import display_star %}
+{% from "core/macros.jinja" import user_profile_link %}
+
 {% if comments %}
   <h2>{% trans %}Comments{% endtrans %}</h2>
   <br>
@@ -5,6 +8,84 @@
 
 <section>
   {% for comment in comments %}
-    {% include "pedagogy/fragments/ue_comment.jinja" %}
+
+    <div id="comment-{{ comment.id }}" class="comment-container">
+
+      <div class="grade-block">
+        <div class="grade-type">
+          <p>{% trans %}Global grade{% endtrans %}</p>
+          <p>{% trans %}Utility{% endtrans %}</p>
+          <p>{% trans %}Interest{% endtrans %}</p>
+          <p>{% trans %}Teaching{% endtrans %}</p>
+          <p>{% trans %}Work load{% endtrans %}</p>
+        </div>
+        <div class="grade-stars">
+          <p>{{ display_star(comment.grade_global) }}</p>
+          <p>{{ display_star(comment.grade_utility) }}</p>
+          <p>{{ display_star(comment.grade_interest) }}</p>
+          <p>{{ display_star(comment.grade_teaching) }}</p>
+          <p>{{ display_star(comment.grade_work_load) }}</p>
+        </div>
+        <div class="grade-extension"></div>
+      </div>
+
+      <div class="comment">
+        <div class="anchor">
+          <a href="{{ url('pedagogy:ue_detail', ue_id=ue.id) }}#comment-{{ comment.id }}"><i class="fa fa-paragraph"></i></a>
+        </div>
+        {{ comment.comment|markdown }}
+      </div>
+
+      <div class="info">
+        {% if comment.is_reported %}
+          <p class="status-reported">
+            {% trans %}This comment has been reported{% endtrans %}
+          </p>
+        {% endif %}
+
+        {% if comment.author_id == user.id or user.has_perm("pedagogy.change_comment") %}
+          <button
+            class="btn btn-orange action"
+            hx-get="{{ url('pedagogy:comment_update', comment_id=comment.id) }}"
+            hx-swap="outerHTML"
+            hx-target="#comment-{{ comment.id }}"
+          >
+            <i class="fa fa-pencil"></i> {% trans %}Edit{% endtrans %}
+          </button>
+        {% endif %}
+        {% if comment.author_id == user.id or user.has_perm("pedagogy.delete_comment") %}
+          <form class="action"
+                hx-post="{{ url('pedagogy:comment_delete', comment_id=comment.id) }}"
+                hx-confirm='{% trans obj=object %}Are you sure you want to delete "{{ obj }}"?{% endtrans %}'
+                hx-swap="outerHTML"
+                hx-target="#comment-{{ comment.id }}"
+          >
+            {% csrf_token %}
+            <button class="btn btn-red action">
+              <i class="fa fa-trash-can"></i> {% trans %}Delete{% endtrans %}
+            </button>
+          </form>
+        {% endif %}
+      </div>
+
+      <div class="comment-end-bar">
+        <div class="report">
+          <p>
+            <a
+              hx-get="{{ url('pedagogy:comment_report', comment_id=comment.id) }}"
+              hx-swap="outerHTML"
+              hx-target="#comment-{{ comment.id }}"
+            >
+              {% trans %}Report this comment{% endtrans %}
+            </a>
+          </p>
+        </div>
+
+        <div class="date"><p>{{ comment.publish_date.strftime('%d/%m/%Y') }}</p></div>
+
+        <div class="author"><p>{{ user_profile_link(comment.author) }}</p></div>
+      </div>
+
+    </div>
   {% endfor %}
 </section>
diff --git a/pedagogy/templates/pedagogy/ue_detail.jinja b/pedagogy/templates/pedagogy/ue_detail.jinja
index aaec4bee..deb8fdf2 100644
--- a/pedagogy/templates/pedagogy/ue_detail.jinja
+++ b/pedagogy/templates/pedagogy/ue_detail.jinja
@@ -82,9 +82,7 @@
         </div>
 
         <div id="comments">
-          {% for comment in comments %}
-            {% include "pedagogy/fragments/ue_comment.jinja" %}
-          {% endfor %}
+          {% include "pedagogy/fragments/ue_details/comments.jinja" %}
         </div>
 
       </div>
diff --git a/pedagogy/urls.py b/pedagogy/urls.py
index cc296f73..4631df90 100644
--- a/pedagogy/urls.py
+++ b/pedagogy/urls.py
@@ -26,7 +26,6 @@ from django.urls import path
 from pedagogy.views import (
     UECommentCreateView,
     UECommentDeleteView,
-    UECommentDetailView,
     UECommentReportCreateView,
     UECommentUpdateView,
     UECreateView,
@@ -46,11 +45,6 @@ urlpatterns = [
         UECommentCreateView.as_view(),
         name="comment_create",
     ),
-    path(
-        "comment/<int:comment_id>/",
-        UECommentDetailView.as_view(),
-        name="comment_detail",
-    ),
     path(
         "comment/<int:comment_id>/edit/",
         UECommentUpdateView.as_view(),
diff --git a/pedagogy/views.py b/pedagogy/views.py
index 036c47fc..ba2157f9 100644
--- a/pedagogy/views.py
+++ b/pedagogy/views.py
@@ -26,6 +26,7 @@ from django.contrib.auth.mixins import PermissionRequiredMixin
 from django.db.models import Exists, OuterRef
 from django.shortcuts import get_object_or_404
 from django.urls import reverse, reverse_lazy
+from django.utils.functional import cached_property
 from django.views.generic import (
     CreateView,
     DeleteView,
@@ -54,12 +55,9 @@ class UECommentCreateView(PermissionRequiredMixin, FragmentMixin, CreateView):
     permission_required = "pedagogy.add_uecomment"
     object = None  # Avoid initialisation bug with FragmentMixin
 
-    @property
+    @cached_property
     def ue(self):
-        if hasattr(self, "_ue"):
-            return self._ue
-        self._ue = get_object_or_404(UE, id=self.kwargs.get("ue_id"))
-        return self._ue
+        return get_object_or_404(UE, id=self.kwargs.get("ue_id"))
 
     def has_permission(self):
         if self.ue.has_user_already_commented(self.request.user):
@@ -112,24 +110,6 @@ class UEDetailView(
         }
 
 
-class UECommentDetailView(PermissionRequiredMixin, DetailView):
-    model = UEComment
-    pk_url_kwarg = "comment_id"
-    template_name = "pedagogy/fragments/ue_comment.jinja"
-    permission_required = "pedagogy.view_ue"
-    context_object_name = "comment"
-
-    def get_queryset(self):
-        return (
-            super().get_queryset().viewable_by(self.request.user).annotate_is_reported()
-        )
-
-    def get_context_data(self, **kwargs):
-        return super().get_context_data(**kwargs) | {
-            "ue": getattr(self.object, "ue", None)
-        }
-
-
 class UECommentUpdateView(PermissionOrAuthorRequiredMixin, AllowFragment, UpdateView):
     """Allow edit of a given comment."""
 
@@ -155,7 +135,7 @@ class UECommentUpdateView(PermissionOrAuthorRequiredMixin, AllowFragment, Update
         }
 
     def get_success_url(self):
-        return reverse("pedagogy:comment_detail", kwargs={"comment_id": self.object.id})
+        return reverse("pedagogy:ue_detail", kwargs={"ue_id": self.object.ue.id})
 
 
 class UECommentDeleteView(PermissionOrAuthorRequiredMixin, AllowFragment, DeleteView):
@@ -173,7 +153,7 @@ class UECommentDeleteView(PermissionOrAuthorRequiredMixin, AllowFragment, Delete
         return response
 
     def get_success_url(self):
-        return reverse("pedagogy:comment_detail", kwargs={"comment_id": self.object.id})
+        return reverse("pedagogy:ue_detail", kwargs={"ue_id": self.object.ue.id})
 
 
 class UEGuideView(PermissionRequiredMixin, TemplateView):
@@ -195,6 +175,10 @@ class UECommentReportCreateView(PermissionRequiredMixin, AllowFragment, CreateVi
         self.ue_comment = get_object_or_404(UEComment, pk=kwargs["comment_id"])
         return super().dispatch(request, *args, **kwargs)
 
+    @cached_property
+    def ue_detail_url(self):
+        return reverse("pedagogy:ue_detail", kwargs={"ue_id": self.ue_comment.ue.id})
+
     def get_form_kwargs(self):
         kwargs = super().get_form_kwargs()
         kwargs["reporter_id"] = self.request.user.id
@@ -204,6 +188,7 @@ class UECommentReportCreateView(PermissionRequiredMixin, AllowFragment, CreateVi
     def get_context_data(self, **kwargs):
         return super().get_context_data() | {
             "comment_id": self.ue_comment.id,
+            "ue_detail_url": self.ue_detail_url,
         }
 
     def form_valid(self, form):
@@ -224,9 +209,7 @@ class UECommentReportCreateView(PermissionRequiredMixin, AllowFragment, CreateVi
         return resp
 
     def get_success_url(self):
-        return reverse(
-            "pedagogy:comment_detail", kwargs={"comment_id": self.ue_comment.id}
-        )
+        return self.ue_detail_url
 
 
 class UEModerationFormView(PermissionRequiredMixin, FormView):