diff --git a/tcf_website/migrations/0024_question_title.py b/tcf_website/migrations/0024_question_title.py
new file mode 100644
index 000000000..aa8e55a37
--- /dev/null
+++ b/tcf_website/migrations/0024_question_title.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.2.28 on 2026-02-04 05:13
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("tcf_website", "0023_remove_sectionenrollment_section_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="question",
+            name="title",
+            field=models.CharField(blank=True, max_length=200),
+        ),
+    ]
diff --git a/tcf_website/migrations/0025_question_instructor_optional.py b/tcf_website/migrations/0025_question_instructor_optional.py
new file mode 100644
index 000000000..65ee0f0f5
--- /dev/null
+++ b/tcf_website/migrations/0025_question_instructor_optional.py
@@ -0,0 +1,25 @@
+# Generated manually
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("tcf_website", "0024_question_title"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="question",
+            name="instructor",
+            field=models.ForeignKey(
+                blank=True,
+                default=None,
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                to="tcf_website.instructor",
+            ),
+        ),
+    ]
diff --git a/tcf_website/migrations/0026_answer_parent_answer.py b/tcf_website/migrations/0026_answer_parent_answer.py
new file mode 100644
index 000000000..1e78cfc79
--- /dev/null
+++ b/tcf_website/migrations/0026_answer_parent_answer.py
@@ -0,0 +1,25 @@
+# Generated by Django 4.2.28 on 2026-03-04 00:02
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("tcf_website", "0025_question_instructor_optional"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="answer",
+            name="parent_answer",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="replies",
+                to="tcf_website.answer",
+            ),
+        ),
+    ]
diff --git a/tcf_website/migrations/0027_remove_answer_unique_answer_per_user_and_question_and_more.py b/tcf_website/migrations/0027_remove_answer_unique_answer_per_user_and_question_and_more.py
new file mode 100644
index 000000000..aac3a47ee
--- /dev/null
+++ b/tcf_website/migrations/0027_remove_answer_unique_answer_per_user_and_question_and_more.py
@@ -0,0 +1,25 @@
+# Generated by Django 4.2.28 on 2026-03-04 00:11
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("tcf_website", "0026_answer_parent_answer"),
+    ]
+
+    operations = [
+        migrations.RemoveConstraint(
+            model_name="answer",
+            name="unique answer per user and question",
+        ),
+        migrations.AddConstraint(
+            model_name="answer",
+            constraint=models.UniqueConstraint(
+                condition=models.Q(("parent_answer__isnull", True)),
+                fields=("user", "question"),
+                name="unique answer per user and question",
+            ),
+        ),
+    ]
diff --git a/tcf_website/migrations/0028_question_department_and_optional_course.py b/tcf_website/migrations/0028_question_department_and_optional_course.py
new file mode 100644
index 000000000..22285473a
--- /dev/null
+++ b/tcf_website/migrations/0028_question_department_and_optional_course.py
@@ -0,0 +1,36 @@
+# Generated manually
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("tcf_website", "0027_remove_answer_unique_answer_per_user_and_question_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="question",
+            name="department",
+            field=models.ForeignKey(
+                blank=True,
+                default=None,
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                to="tcf_website.department",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="question",
+            name="course",
+            field=models.ForeignKey(
+                blank=True,
+                default=None,
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                to="tcf_website.course",
+            ),
+        ),
+    ]
diff --git a/tcf_website/migrations/0029_alter_answer_semester.py b/tcf_website/migrations/0029_alter_answer_semester.py
new file mode 100644
index 000000000..cc2f7358a
--- /dev/null
+++ b/tcf_website/migrations/0029_alter_answer_semester.py
@@ -0,0 +1,22 @@
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("tcf_website", "0028_question_department_and_optional_course"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="answer",
+            name="semester",
+            field=models.ForeignKey(
+                blank=True,
+                default=None,
+                null=True,
+                on_delete=models.SET_NULL,
+                to="tcf_website.semester",
+            ),
+        ),
+    ]
diff --git a/tcf_website/migrations/0030_remove_answer_unique_answer_per_user_and_question.py b/tcf_website/migrations/0030_remove_answer_unique_answer_per_user_and_question.py
new file mode 100644
index 000000000..ac03b8a57
--- /dev/null
+++ b/tcf_website/migrations/0030_remove_answer_unique_answer_per_user_and_question.py
@@ -0,0 +1,17 @@
+# Generated by Django 4.2.28 on 2026-05-01
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("tcf_website", "0029_alter_answer_semester"),
+    ]
+
+    operations = [
+        migrations.RemoveConstraint(
+            model_name="answer",
+            name="unique answer per user and question",
+        ),
+    ]
diff --git a/tcf_website/models/models.py b/tcf_website/models/models.py
index 73f4fcee3..01740cd50 100644
--- a/tcf_website/models/models.py
+++ b/tcf_website/models/models.py
@@ -1,6 +1,7 @@
 # pylint: disable=missing-class-docstring, wildcard-import, fixme, too-many-lines
 """TCF Database models."""
 
+from collections import defaultdict
 from decimal import Decimal
 
 from django.conf import settings
@@ -14,6 +15,7 @@
     Avg,
     Case,
     CharField,
+    Count,
     Exists,
     ExpressionWrapper,
     F,
@@ -1421,17 +1423,40 @@ class Meta:
 class Question(models.Model):
     """Question model.
     Belongs to a User.
-    Has a course and instructor.
+    Has either a course or department target, and an optional instructor.
     """
 
+    title = models.CharField(max_length=200, blank=True)
     text = models.TextField()
-    course = models.ForeignKey(Course, on_delete=models.CASCADE)
-    instructor = models.ForeignKey(Instructor, on_delete=models.CASCADE, default=None)
+    course = models.ForeignKey(
+        Course, on_delete=models.SET_NULL, null=True, blank=True, default=None
+    )
+    department = models.ForeignKey(
+        Department, on_delete=models.SET_NULL, null=True, blank=True, default=None
+    )
+    instructor = models.ForeignKey(
+        Instructor, on_delete=models.SET_NULL, null=True, blank=True, default=None
+    )
     user = models.ForeignKey(User, on_delete=models.CASCADE)
     created = models.DateTimeField(auto_now_add=True)
 
+    @property
+    def is_deleted(self):
+        """Return whether this question has been soft-deleted."""
+        return self.text == ""
+
+    def soft_delete(self):
+        """Clear user-authored content while preserving replies."""
+        self.title = ""
+        self.text = ""
+        self.save(update_fields=["title", "text"])
+
     def __str__(self):
-        return f"Question for {self.course}"
+        if self.course:
+            return f"Question for {self.course}"
+        if self.department:
+            return f"Question for {self.department.name}"
+        return "Question"
 
     def count_votes(self):
         """Sum votes for review."""
@@ -1466,38 +1491,11 @@ def upvote(self, user):
             question=self,
         )
 
-    def downvote(self, user):
-        """Create a downvote."""
-
-        # Check if already downvoted.
-        downvoted = VoteQuestion.objects.filter(
-            user=user,
-            question=self,
-            value=-1,
-        ).exists()
-
-        # Delete all prior votes.
-        VoteQuestion.objects.filter(
-            user=user,
-            question=self,
-        ).delete()
-
-        # Don't downvote again if previously downvoted.
-        if downvoted:
-            return
-
-        VoteQuestion.objects.create(
-            value=-1,
-            user=user,
-            question=self,
-        )
-
     @staticmethod
     def display_activity(course_id, instructor_id, user):
         """Prepare review list for course-instructor page."""
         question = (
             Question.objects.filter(instructor=instructor_id, course=course_id)
-            .exclude(text="")
             .annotate(
                 sum_q_votes=models.functions.Coalesce(
                     models.Sum("votequestion__value"), models.Value(0)
@@ -1521,13 +1519,29 @@ class Answer(models.Model):
     """Answer model.
     Belongs to a User.
     Has a question.
+    Can have a parent answer for replies.
     """
 
     text = models.TextField()
     question = models.ForeignKey(Question, on_delete=models.CASCADE)
     user = models.ForeignKey(User, on_delete=models.CASCADE)
     created = models.DateTimeField(auto_now_add=True)
-    semester = models.ForeignKey(Semester, on_delete=models.CASCADE, default=None)
+    semester = models.ForeignKey(
+        Semester, on_delete=models.SET_NULL, null=True, blank=True, default=None
+    )
+    parent_answer = models.ForeignKey(
+        "self", null=True, blank=True, on_delete=models.CASCADE, related_name="replies"
+    )
+
+    @property
+    def is_deleted(self):
+        """Return whether this answer has been soft-deleted."""
+        return self.text == ""
+
+    def soft_delete(self):
+        """Clear user-authored content while preserving nested replies."""
+        self.text = ""
+        self.save(update_fields=["text"])
 
     def __str__(self):
         return f"Answer for {self.question}"
@@ -1565,38 +1579,12 @@ def upvote(self, user):
             answer=self,
         )
 
-    def downvote(self, user):
-        """Create a downvote."""
-
-        # Check if already downvoted.
-        downvoted = VoteAnswer.objects.filter(
-            user=user,
-            answer=self,
-            value=-1,
-        ).exists()
-
-        # Delete all prior votes.
-        VoteAnswer.objects.filter(
-            user=user,
-            answer=self,
-        ).delete()
-
-        # Don't downvote again if previously downvoted.
-        if downvoted:
-            return
-
-        VoteAnswer.objects.create(
-            value=-1,
-            user=user,
-            answer=self,
-        )
-
     @staticmethod
     def display_activity(question_id, user):
-        """Prepare answers for course-instructor page."""
-        answer = (
+        """Prepare answers and replies for question detail page."""
+        answers = (
             Answer.objects.filter(question=question_id)
-            .exclude(text="")
+            .select_related("user", "semester", "parent_answer")
             .annotate(
                 sum_a_votes=models.functions.Coalesce(
                     models.Sum("voteanswer__value"), models.Value(0)
@@ -1604,7 +1592,7 @@ def display_activity(question_id, user):
             )
         )
         if user.is_authenticated:
-            answer = answer.annotate(
+            answers = answers.annotate(
                 user_a_vote=models.functions.Coalesce(
                     models.Sum(
                         "voteanswer__value",
@@ -1613,15 +1601,36 @@ def display_activity(question_id, user):
                     models.Value(0),
                 ),
             )
-        return answer.order_by("-created")
 
-    class Meta:
-        constraints = [
-            models.UniqueConstraint(
-                fields=["user", "question"],
-                name="unique answer per user and question",
-            )
-        ]
+        answers_list = list(answers.order_by("created"))
+        children_by_parent = defaultdict(list)
+        root_answers = []
+
+        for answer in answers_list:
+            answer.nested_replies = []
+            answer.is_deleted_placeholder = answer.is_deleted
+            if answer.parent_answer_id is None:
+                root_answers.append(answer)
+            else:
+                children_by_parent[answer.parent_answer_id].append(answer)
+
+        def attach_children(answer, depth):
+            answer.depth = depth
+            answer.render_depth = min(depth, 3)
+            children = children_by_parent.get(answer.id, [])
+            visible_children = []
+            for child in children:
+                if attach_children(child, depth + 1):
+                    visible_children.append(child)
+            answer.nested_replies = visible_children
+            return bool(answer.text) or bool(answer.nested_replies)
+
+        visible_roots = []
+        for answer in root_answers:
+            if attach_children(answer, 0):
+                visible_roots.append(answer)
+
+        return sorted(visible_roots, key=lambda answer: answer.created, reverse=True)
 
 
 class VoteQuestion(models.Model):
diff --git a/tcf_website/static/icons/icons.css b/tcf_website/static/icons/icons.css
index 261a94203..edbda7494 100644
--- a/tcf_website/static/icons/icons.css
+++ b/tcf_website/static/icons/icons.css
@@ -211,6 +211,15 @@
   background-position: center;
 }
 
+.fa-thumbs-up-solid {
+  width: 1em;
+  height: 1em;
+  background-image:url("../icons/img/fa-thumbs-up-solid.svg");
+  background-repeat: no-repeat;
+  background-size: contain;
+  background-position: center;
+}
+
 .fa-thumbs-down {
   width: 1em;
   height: 1em;
@@ -280,11 +289,6 @@
   background-repeat: no-repeat;
   background-size: contain;
   background-position: center;
-  width: 1em;
-  height: 1em;
-  vertical-align: middle;
-  display: inline-block;
-  filter: invert(100%) brightness(150%);
 }
 
 .fa-user-friends {
@@ -329,6 +333,20 @@
   background-position: center;
 }
 
+.fa-comments {
+  background-image: url("../icons/img/fa-comments.svg");
+  background-repeat: no-repeat;
+  background-size: contain;
+  background-position: center;
+}
+
+.fa-reply {
+  background-image: url("../icons/img/fa-reply.svg");
+  background-repeat: no-repeat;
+  background-size: contain;
+  background-position: center;
+}
+
 .invert-to-light {
   filter: invert(1);
 }
diff --git a/tcf_website/static/icons/img/fa-comments.svg b/tcf_website/static/icons/img/fa-comments.svg
new file mode 100644
index 000000000..56534d03b
--- /dev/null
+++ b/tcf_website/static/icons/img/fa-comments.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640"><!--!Font Awesome Free 7.1.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2025 Fonticons, Inc.--><path d="M416 208C416 305.2 330 384 224 384C197.3 384 171.9 379 148.8 370L67.2 413.2C57.9 418.1 46.5 416.4 39 409C31.5 401.6 29.8 390.1 34.8 380.8L70.4 313.6C46.3 284.2 32 247.6 32 208C32 110.8 118 32 224 32C330 32 416 110.8 416 208zM416 576C321.9 576 243.6 513.9 227.2 432C347.2 430.5 451.5 345.1 463 229.3C546.3 248.5 608 317.6 608 400C608 439.6 593.7 476.2 569.6 505.6L605.2 572.8C610.1 582.1 608.4 593.5 601 601C593.6 608.5 582.1 610.2 572.8 605.2L491.2 562C468.1 571 442.7 576 416 576z" data-index="0" style="opacity: 1;"></path></svg>
\ No newline at end of file
diff --git a/tcf_website/static/icons/img/fa-reply.svg b/tcf_website/static/icons/img/fa-reply.svg
new file mode 100644
index 000000000..42d94b077
--- /dev/null
+++ b/tcf_website/static/icons/img/fa-reply.svg
@@ -0,0 +1,9 @@
+<svg id="Reply--Streamline-Carbon" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" height="16" width="16">
+  <desc>
+    Reply Streamline Icon: https://streamlinehq.com
+  </desc>
+  <defs></defs>
+  <title>reply</title>
+  <path d="M14.44 15a0.5 0.5 0 0 1 -0.44 -0.25A7.595 7.595 0 0 0 7.5 11v3a0.5 0.5 0 0 1 -0.31 0.46 0.5 0.5 0 0 1 -0.545 -0.105l-6 -6a0.5 0.5 0 0 1 0 -0.71l6 -6a0.5 0.5 0 0 1 0.545 -0.105A0.5 0.5 0 0 1 7.5 2v3.055a8.595 8.595 0 0 1 7.5 8.5 8.17 8.17 0 0 1 -0.065 1 0.5 0.5 0 0 1 -0.395 0.43ZM7.25 10A8.81 8.81 0 0 1 14 13a7.655 7.655 0 0 0 -7.045 -7 0.5 0.5 0 0 1 -0.455 -0.5V3.205L1.705 8 6.5 12.795V10.5a0.5 0.5 0 0 1 0.5 -0.5h0.27Z" fill="#000000" stroke-width="0.5"></path>
+  <path id="_Transparent_Rectangle_" d="M0 0h16v16H0Z" fill="none" stroke-width="0.5"></path>
+</svg>
\ No newline at end of file
diff --git a/tcf_website/static/icons/img/fa-thumbs-up-solid.svg b/tcf_website/static/icons/img/fa-thumbs-up-solid.svg
new file mode 100644
index 000000000..c104d40b0
--- /dev/null
+++ b/tcf_website/static/icons/img/fa-thumbs-up-solid.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640"><!--!Font Awesome Free 7.2.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2026 Fonticons, Inc.--><path d="M144 224C161.7 224 176 238.3 176 256L176 512C176 529.7 161.7 544 144 544L96 544C78.3 544 64 529.7 64 512L64 256C64 238.3 78.3 224 96 224L144 224zM334.6 80C361.9 80 384 102.1 384 129.4L384 133.6C384 140.4 382.7 147.2 380.2 153.5L352 224L512 224C538.5 224 560 245.5 560 272C560 291.7 548.1 308.6 531.1 316C548.1 323.4 560 340.3 560 360C560 383.4 543.2 402.9 521 407.1C525.4 414.4 528 422.9 528 432C528 454.2 513 472.8 492.6 478.3C494.8 483.8 496 489.8 496 496C496 522.5 474.5 544 448 544L360.1 544C323.8 544 288.5 531.6 260.2 508.9L248 499.2C232.8 487.1 224 468.7 224 449.2L224 262.6C224 247.7 227.5 233 234.1 219.7L290.3 107.3C298.7 90.6 315.8 80 334.6 80z"/></svg>
\ No newline at end of file
diff --git a/tcf_website/static/qa/new_answer.js b/tcf_website/static/qa/new_answer.js
index 71f8c539c..cf1fc7230 100644
--- a/tcf_website/static/qa/new_answer.js
+++ b/tcf_website/static/qa/new_answer.js
@@ -44,45 +44,17 @@ jQuery(function ($) {
   ids.forEach((item) => populateDropdown(item));
 });
 
-// Below checks whether the user has already answered the question
 $(document).ready(function () {
-  $("#duplicate-answer").hide();
-
   $(document).on("click", "#answerQuestionBtn", function () {
     const questionId = $(this).data("id");
     $("#answerForm #questionInput").val(questionId);
   });
 
-  // Stop normal submit to check for duplicate answer with ajax request
   $("#answerForm").submit(function (e) {
-    e.preventDefault();
-
-    $.ajax({
-      type: "POST",
-      url: "/answers/check_duplicate/",
-      data: $("#answerForm").serialize(),
-      async: false,
-      success: function (check) {
-        if (check.duplicate) {
-          // Display error message for warning
-          $("#duplicate-answer").show();
-        } else {
-          // Timeout button for 3 seconds so user can't spam button while form is submitting
-          $("#submitBtn").prop("disabled", true);
-          setTimeout(enableButton, 3000);
-          // Not a duplicate answer so proceed with normal form submission for new answer
-          document.getElementById("answerForm").submit();
-        }
-      },
-    });
+    $("#submitBtn").prop("disabled", true);
   });
 });
 
-// Re-enable button
-function enableButton() {
-  $("#submitBtn").prop("disabled", false);
-}
-
 // Clears all dropdown options & adds a disabled default option
 function clearDropdown(id) {
   $(id).empty();
diff --git a/tcf_website/static/qa/qa_dashboard.css b/tcf_website/static/qa/qa_dashboard.css
new file mode 100644
index 000000000..92540b483
--- /dev/null
+++ b/tcf_website/static/qa/qa_dashboard.css
@@ -0,0 +1,1043 @@
+/* Main Container */
+.qa-container {
+  display: flex;
+  height: calc(100vh - 120px);
+  width: 100%;
+  overflow: hidden;
+  background: #ffffff;
+}
+
+/* Left Sidebar: Posts List */
+.qa-sidebar {
+  flex: 0 0 380px;
+  background: #f8f9fa;
+  border-right: 1px solid #dee2e6;
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+}
+
+/* Header Section */
+.qa-header {
+  padding: 1rem;
+  background: #ffffff;
+  border-bottom: 1px solid #dee2e6;
+}
+
+.btn-new-post {
+  width: 100%;
+  background: var(--main-color);
+  color: white;
+  border: none;
+  padding: 0.75rem 1rem;
+  border-radius: 6px;
+  font-weight: 600;
+  cursor: pointer;
+  margin-bottom: 0.75rem;
+  transition: background 0.2s;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.btn-new-post:hover {
+  background: var(--secondary-color);
+}
+
+.btn-new-post i {
+  margin-right: 0.5rem;
+}
+
+.search-container {
+  position: relative;
+}
+
+.search-icon {
+  position: absolute;
+  left: 0.75rem;
+  top: 50%;
+  transform: translateY(-50%);
+  color: #6c757d;
+}
+
+.search-input {
+  width: 100%;
+  padding: 0.5rem 0.75rem 0.5rem 2.5rem;
+  border: 1px solid #ced4da;
+  border-radius: 4px;
+  font-size: 0.9rem;
+}
+
+.search-input:focus {
+  outline: none;
+  border-color: var(--main-color);
+  box-shadow: 0 0 0 0.2rem rgba(39, 79, 151, 0.15);
+}
+
+/* Filters Section */
+.qa-filters {
+  padding: 0.5rem 1.25rem 0.5rem 1rem;
+  background: #ffffff;
+  border-bottom: 1px solid #dee2e6;
+  display: flex;
+  gap: 0;
+  box-sizing: border-box;
+}
+
+.filter-btn {
+  background: transparent;
+  border: 1px solid #dee2e6;
+  padding: 0.35rem 0.75rem;
+  border-radius: 4px;
+  font-size: 0.85rem;
+  cursor: pointer;
+  color: #495057;
+  transition: all 0.2s;
+}
+
+.filter-btn:hover {
+  background: #e9ecef;
+}
+
+.filter-btn.filter-active {
+  background: #e7f3ff;
+  color: var(--main-color);
+  border-color: var(--main-color);
+  font-weight: 600;
+}
+
+.filter-btn i {
+  margin-right: 0.25rem;
+}
+
+.filter-row {
+  display: flex;
+  gap: 0;
+  width: auto;
+  max-width: 100%;
+  align-items: center;
+  padding-right: 0.15rem;
+}
+
+.filter-row .dropdown {
+  flex: 0 0 auto;
+  min-width: 0;
+  position: relative;
+  z-index: 20;
+}
+
+#departmentDropdownContainer .filter-btn {
+  display: inline-flex;
+  align-items: center;
+  min-width: 0;
+  width: 180px;
+}
+
+#departmentDropdownContainer .filter-btn span {
+  flex: 1;
+  min-width: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  display: inline-block;
+}
+
+#courseDropdownContainer {
+  flex: 0 0 auto;
+  min-width: 0;
+  margin-left: -2px;
+  opacity: 0;
+  transform: translateX(-8px);
+  transition: opacity 0.2s ease, transform 0.2s ease;
+}
+
+#courseDropdownContainer .filter-btn {
+  display: inline-flex;
+  align-items: center;
+  white-space: nowrap;
+}
+
+#courseDropdownContainer .filter-btn span {
+  max-width: 18ch;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+#courseDropdownContainer.is-visible {
+  opacity: 1;
+  transform: translateX(0);
+}
+
+/* Dropdown search input */
+.dropdown-search-wrapper {
+  padding: 0.4rem 0.6rem;
+  border-bottom: 1px solid #e9ecef;
+}
+
+.dropdown-search-input {
+  width: 100%;
+  padding: 0.35rem 0.6rem;
+  border: 1px solid #ced4da;
+  border-radius: 4px;
+  font-size: 0.825rem;
+  outline: none;
+}
+
+.dropdown-search-input:focus {
+  border-color: var(--main-color);
+  box-shadow: 0 0 0 0.15rem rgba(39, 79, 151, 0.15);
+}
+
+.dropdown-items-list {
+  max-height: 250px;
+  overflow-y: auto;
+}
+
+.dropdown-items-list .dropdown-item.d-none {
+  display: none !important;
+}
+
+/* Posts List */
+.posts-list {
+  flex: 1;
+  overflow-y: auto;
+  background: #f8f9fa;
+}
+
+.post-item {
+  display: block;
+  width: 100%;
+  padding: 1rem;
+  background: white;
+  border: 0;
+  border-bottom: 1px solid #e9ecef;
+  cursor: pointer;
+  font: inherit;
+  text-align: left;
+  transition: background 0.2s;
+}
+
+.post-item:hover {
+  background: #f8f9fa;
+}
+
+.post-item.active {
+  background: #e7f3ff;
+  border-left: 3px solid var(--main-color);
+}
+
+.post-header {
+  display: flex;
+  align-items: center;
+  gap: 0.5rem;
+  margin-bottom: 0.5rem;
+}
+
+.post-tag {
+  background: var(--accent-color);
+  color: white;
+  padding: 0.15rem 0.5rem;
+  border-radius: 3px;
+  font-size: 0.75rem;
+  font-weight: 600;
+}
+
+.post-title {
+  font-weight: 600;
+  font-size: 0.9rem;
+  flex: 1;
+  color: #212529;
+}
+
+.post-date {
+  font-size: 0.75rem;
+  color: #6c757d;
+}
+
+.post-preview {
+  font-size: 0.85rem;
+  color: #495057;
+  margin-bottom: 0.5rem;
+  line-height: 1.4;
+}
+
+.post-footer {
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+}
+
+.post-stats {
+  display: inline-flex;
+  align-items: center;
+  gap: 0.3rem;
+}
+
+/* Right Content Area */
+.qa-content {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  background: white;
+  overflow: hidden;
+}
+
+/* Content Navigation */
+.content-nav {
+  display: flex;
+  align-items: center;
+  padding: 1rem;
+  border-bottom: 1px solid #dee2e6;
+  gap: 1rem;
+}
+
+.nav-btn {
+  background: transparent;
+  border: none;
+  color: #495057;
+  cursor: pointer;
+  padding: 0.5rem;
+  font-size: 1rem;
+  transition: color 0.2s;
+}
+
+.nav-btn:hover {
+  color: var(--accent-color);
+}
+
+.post-info {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+  gap: 0.5rem;
+  color: #495057;
+  font-size: 0.9rem;
+}
+
+.post-info h3,
+.post-info .instructor h6 {
+  margin: 0;
+}
+
+.post-info h3 {
+  font-size: 1.75rem;
+  line-height: 1.2;
+}
+
+.post-info .course-link {
+  color: black;
+  text-decoration: none;
+}
+
+.post-info .course-link:hover {
+  color: var(--accent-color);
+}
+
+.post-info .instructor-profile {
+  display: inline-flex;
+  align-items: center;
+  text-decoration: none;
+}
+
+.post-info .instructor h6 {
+  display: inline-flex;
+  align-items: center;
+  gap: 0.5rem;
+}
+
+.post-info .qa-instructor-link {
+  font-size: 1rem;
+  line-height: 1.2;
+}
+
+.post-info .instructor-select {
+  font-size: inherit;
+  line-height: 1.1;
+  color: var(--main-color)
+}
+
+.post-info .instructor-select:hover {
+  color: var(--main-color)
+}
+
+.post-info i {
+  color: #6c757d;
+}
+
+/* Post Content */
+.post-content {
+  flex: 1;
+  overflow-y: auto;
+  padding: 2rem;
+}
+
+/* Main Question Section */
+.main-question {
+  margin-bottom: 1rem;
+}
+
+.question-header-wrapper {
+  display: flex;
+  justify-content: space-between;
+  align-items: flex-start;
+  gap: 1.5rem;
+  margin-bottom: 1rem;
+}
+
+.question-header-content {
+  flex: 1;
+}
+
+/* Comments Section */
+.comments-section {
+  margin-top: 0.5rem;
+}
+
+.comments-header {
+  font-size: 1.25rem;
+  font-weight: 600;
+  color: #212529;
+  margin-bottom: 1.5rem;
+  padding-bottom: 0.75rem;
+  border-bottom: 1px solid #e9ecef;
+}
+
+/* Thread Container */
+.thread-container {
+  margin-bottom: 2rem;
+}
+
+.thread-post {
+  display: flex;
+  flex-direction: column;
+  gap: 0;
+  margin-bottom: 2rem;
+  position: relative;
+  min-width: 0;
+}
+
+.thread-post.is-reply {
+  margin-bottom: 1rem;
+}
+
+.post-main {
+  flex: 1;
+  min-width: 0;
+}
+
+.post-meta {
+  color: #adb5bd;
+  font-size: 15px;
+  margin-bottom: 1rem;
+}
+
+.post-header-info {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 0.5rem;
+  margin-bottom: 0.5rem;
+}
+
+.answer-header-left {
+  display: flex;
+  align-items: center;
+  gap: 0.5rem;
+}
+
+.answer-header-actions {
+  display: flex;
+  align-items: center;
+  gap: 0.25rem;
+}
+
+.action-btn-sm {
+  background: transparent;
+  border: none;
+  padding: 0.2rem 0.4rem;
+  cursor: pointer;
+  color: #adb5bd;
+  font-size: 0.8rem;
+  border-radius: 3px;
+  transition: all 0.2s;
+}
+
+.action-btn-sm:hover {
+  color: #495057;
+  background: #f0f0f0;
+}
+
+.action-btn-sm.delete-answer-btn:hover {
+  color: #dc3545;
+  background: #fdf0f0;
+}
+
+.semester-tag {
+  background: var(--accent-color);
+  color: white;
+  padding: 0.15rem 0.5rem;
+  border-radius: 3px;
+  font-size: 0.75rem;
+  font-weight: 600;
+}
+
+.post-time {
+  font-size: 0.875rem;
+  color: #6c757d;
+}
+
+.post-content-title {
+  font-size: 1.5rem;
+  font-weight: 700;
+  color: #212529;
+}
+
+.post-body {
+  font-size: 1rem;
+  line-height: 1.6;
+  margin-bottom: 1rem;
+  color: #333;
+}
+
+.post-body p {
+  margin-bottom: 0.75rem;
+}
+
+.post-tags {
+  margin-bottom: 1rem;
+}
+
+.tag {
+  display: inline-block;
+  background: var(--main-color);
+  color: white;
+  padding: 0.15rem 0.5rem;
+  border-radius: 3px;
+  font-size: 0.75rem;
+  margin-right: 0.5rem;
+}
+
+/* Post Actions */
+.post-actions {
+  display: flex;
+  align-items: center;
+  gap: 1rem;
+  margin-top: 0.75rem;
+  flex-wrap: wrap;
+}
+
+.main-question .post-actions {
+  padding: 1rem 0;
+  margin-top: 0.25rem;
+}
+
+.main-question .action-btn {
+  background: transparent;
+  border: 1px solid #dee2e6;
+  padding: 0.5rem 1rem;
+  border-radius: 4px;
+  cursor: pointer;
+  color: #495057;
+  font-size: 0.875rem;
+  transition: all 0.2s;
+  display: inline-flex;
+  align-items: center;
+  gap: 0.35rem;
+  outline: none;
+}
+
+.main-question .action-btn:hover {
+  background: #f8f9fa;
+  color: var(--accent-color);
+}
+
+.main-question .action-btn.delete-question-btn:hover {
+  color: #dc3545;
+  border-color: #dc3545;
+  background: #fdf0f0;
+}
+
+.question-actions-divider {
+  width: 1px;
+  height: 1.5rem;
+  background: #dee2e6;
+  margin: 0 0.25rem;
+}
+
+.thread-container .post-actions {
+  gap: 0.25rem;
+}
+
+.comments-section .action-btn {
+  background: transparent;
+  border: none;
+  padding: 0.25rem 0.5rem;
+  cursor: pointer;
+  color: #495057;
+  font-size: 0.9rem;
+  transition: color 0.2s;
+  display: inline-flex;
+  align-items: center;
+  gap: 0.35rem;
+  position: relative;
+}
+
+.comments-section .action-btn:hover {
+  color: var(--main-color);
+}
+
+.comments-section .action-btn[title]:hover::after {
+  content: attr(title);
+  position: absolute;
+  bottom: 100%;
+  left: 50%;
+  transform: translateX(-50%);
+  background: #333;
+  color: white;
+  padding: 0.25rem 0.5rem;
+  border-radius: 4px;
+  font-size: 0.75rem;
+  white-space: nowrap;
+  margin-bottom: 4px;
+}
+
+.action-btn i {
+  font-size: 1rem;
+}
+
+/* Replies Container */
+.replies-container {
+  margin-top: 1rem;
+  margin-left: 1.25rem;
+  padding-left: 1rem;
+  border-left: 2px solid #e9ecef;
+}
+
+.replies-container.thread-depth-1 {
+  margin-left: 2rem;
+}
+
+.replies-container.thread-depth-2,
+.replies-container.thread-depth-3 {
+  margin-left: 1.5rem;
+}
+
+.replies-container.thread-depth-0 {
+  margin-left: 0;
+}
+
+.replies-container .thread-post {
+  margin-bottom: 1rem;
+}
+
+/* Reply Button */
+.reply-btn {
+  background: transparent;
+  border: none;
+  padding: 0.25rem 0.5rem;
+  cursor: pointer;
+  color: #6c757d;
+  font-size: 0.875rem;
+  transition: color 0.2s;
+  display: inline-flex;
+  align-items: center;
+  gap: 0.35rem;
+}
+
+.reply-btn:hover {
+  color: var(--main-color);
+}
+
+.reply-btn i {
+  font-size: 0.9rem;
+}
+
+/* Reply Form Container */
+.reply-form-container {
+  margin-top: 1rem;
+  margin-left: 1.25rem;
+  padding-left: 1rem;
+  border-left: 2px solid var(--main-color);
+}
+
+.reply-form-container.thread-depth-0 {
+  margin-left: 0;
+}
+
+.reply-form-container.thread-depth-1 {
+  margin-left: 2rem;
+}
+
+.reply-form-container.thread-depth-2,
+.reply-form-container.thread-depth-3 {
+  margin-left: 1.5rem;
+}
+
+.reply-form-container .reply-textarea {
+  width: 100%;
+  min-height: 80px;
+  padding: 0.75rem 1rem;
+  border: 1px solid #ced4da;
+  border-radius: 6px;
+  font-size: 0.9rem;
+  font-family: inherit;
+  resize: vertical;
+  margin-bottom: 0.75rem;
+}
+
+.reply-form-container .reply-textarea:focus {
+  outline: none;
+  border-color: var(--main-color);
+  box-shadow: 0 0 0 0.2rem rgba(39, 79, 151, 0.15);
+}
+
+.btn-cancel-reply {
+  background: transparent;
+  border: 1px solid #dee2e6;
+  padding: 0.35rem 1rem;
+  border-radius: 4px;
+  font-weight: 600;
+  font-size: 0.85rem;
+  cursor: pointer;
+  color: #495057;
+  transition: all 0.2s;
+}
+
+.btn-cancel-reply:hover {
+  background: #f8f9fa;
+  border-color: #adb5bd;
+}
+
+/* Reply Input */
+.reply-input-container {
+  display: flex;
+  gap: 1rem;
+  margin-top: 2rem;
+  padding-top: 2rem;
+  border-top: 1px solid #dee2e6;
+}
+
+.reply-input-container form {
+  width: 100%;
+  flex: 1;
+}
+
+.reply-input-wrapper {
+  flex: 1;
+}
+
+.reply-textarea {
+  width: 100%;
+  min-height: 100px;
+  padding: 0.75rem 1rem;
+  border: 1px solid #ced4da;
+  border-radius: 6px;
+  font-size: 0.95rem;
+  font-family: inherit;
+  resize: vertical;
+  margin-bottom: 0.75rem;
+}
+
+.reply-textarea:focus {
+  outline: none;
+  border-color: var(--main-color);
+  box-shadow: 0 0 0 0.2rem rgba(39, 79, 151, 0.15);
+}
+
+.btn-submit-reply {
+  background: var(--main-color);
+  color: white;
+  border: none;
+  padding: 0.35rem 1rem;
+  border-radius: 4px;
+  font-weight: 600;
+  font-size: 0.85rem;
+  cursor: pointer;
+  transition: background 0.2s;
+}
+
+.btn-submit-reply:hover {
+  background: var(--secondary-color);
+}
+
+/* Modal Styles */
+.modal-overlay {
+  display: none;
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.5);
+  z-index: 1000;
+  justify-content: center;
+  align-items: center;
+}
+
+.modal-overlay.active {
+  display: flex;
+}
+
+.modal-container {
+  background: white;
+  border-radius: 8px;
+  width: 100%;
+  max-width: 900px;
+  max-height: 80vh;
+  overflow-y: auto;
+  box-shadow: 0 4px 20px rgba(0, 0, 0, 0.15);
+}
+
+.modal-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 0.75rem 1.25rem;
+  border-bottom: 1px solid #dee2e6;
+}
+
+.modal-header h2 {
+  margin: 0;
+  font-size: 1.1rem;
+  font-weight: 600;
+  color: #212529;
+}
+
+.modal-close {
+  background: transparent;
+  border: none;
+  font-size: 1rem;
+  color: #6c757d;
+  cursor: pointer;
+  padding: 0.15rem;
+  transition: color 0.2s;
+}
+
+.modal-close:hover {
+  color: #212529;
+}
+
+.modal-body {
+  padding: 0.75rem 1.25rem;
+}
+
+.form-group {
+  margin-bottom: 0.6rem;
+}
+
+.form-group label {
+  display: block;
+  font-weight: 600;
+  font-size: 0.8rem;
+  color: #495057;
+  margin-bottom: 0.25rem;
+}
+
+.form-group input[type="text"],
+.form-group textarea,
+.form-group select {
+  width: 100%;
+  padding: 0.4rem 0.75rem;
+  border: 1px solid #ced4da;
+  border-radius: 4px;
+  font-size: 0.85rem;
+  font-family: inherit;
+  transition: border-color 0.2s, box-shadow 0.2s;
+}
+
+.form-group input[type="text"]:focus,
+.form-group textarea:focus,
+.form-group select:focus {
+  outline: none;
+  border-color: var(--main-color);
+  box-shadow: 0 0 0 0.2rem rgba(39, 79, 151, 0.15);
+}
+
+.form-group textarea {
+  min-height: 60px;
+  resize: vertical;
+}
+
+.form-group select[multiple] {
+  min-height: 60px;
+}
+
+.form-hint {
+  margin-top: 0.2rem;
+  font-size: 0.7rem;
+  color: #6c757d;
+}
+
+.modal-footer {
+  display: flex;
+  justify-content: flex-end;
+  gap: 0.5rem;
+  padding-top: 0.5rem;
+  border-top: 1px solid #dee2e6;
+  margin-top: 0.15rem;
+}
+
+.btn-cancel {
+  background: transparent;
+  border: 1px solid #dee2e6;
+  padding: 0.4rem 1rem;
+  border-radius: 4px;
+  font-weight: 600;
+  font-size: 0.8rem;
+  cursor: pointer;
+  color: #495057;
+  transition: all 0.2s;
+}
+
+.btn-cancel:hover {
+  background: #f8f9fa;
+  border-color: #adb5bd;
+}
+
+.btn-submit {
+  background: var(--main-color);
+  border: none;
+  padding: 0.4rem 1rem;
+  border-radius: 4px;
+  font-weight: 600;
+  font-size: 0.8rem;
+  cursor: pointer;
+  color: white;
+  transition: background 0.2s;
+}
+
+.btn-submit:hover {
+  background: var(--secondary-color);
+}
+
+/* Responsive Design */
+@media (max-width: 768px) {
+  .qa-container {
+    flex-direction: column;
+  }
+
+  .qa-sidebar {
+    flex: 0 0 auto;
+    max-height: 40vh;
+  }
+
+  .qa-content {
+    flex: 1;
+  }
+
+  .modal-container {
+    margin: 1rem;
+    max-height: calc(100vh - 2rem);
+  }
+}
+
+/* Course Search Results */
+.course-search-results {
+    display: none;
+    position: absolute;
+    z-index: 1050;
+    background: white;
+    border: 1px solid #ced4da;
+    border-top: none;
+    border-radius: 0 0 4px 4px;
+    max-height: 200px;
+    overflow-y: auto;
+    width: 100%;
+}
+
+.course-search-results.show {
+    display: block;
+}
+
+.course-result-item {
+    padding: 0.5rem 0.75rem;
+    cursor: pointer;
+    border-bottom: 1px solid #f0f0f0;
+}
+
+.course-result-item:hover {
+    background: #f8f9fa;
+}
+
+.course-result-code {
+    font-weight: 600;
+    font-size: 0.875rem;
+}
+
+.course-result-title {
+    font-size: 0.8rem;
+    color: #6c757d;
+}
+
+/* Loading state for content panel */
+.qa-content.loading {
+    opacity: 0.5;
+    pointer-events: none;
+}
+
+/* No post selected / empty state */
+.no-post-selected,
+.no-posts {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    height: 100%;
+    color: #6c757d;
+    text-align: center;
+    padding: 2rem;
+}
+
+.vote-btn.voted .fa-thumbs-up,
+.post-stats.voted .fa-thumbs-up {
+  background-image: url("../icons/img/fa-thumbs-up-solid.svg");
+  filter: brightness(0) saturate(100%) invert(51%) sepia(98%) saturate(1828%) hue-rotate(0deg) brightness(102%) contrast(103%);
+  transform: scale(1.2);
+}
+
+/* Login prompt */
+.login-prompt {
+    padding: 1rem 2rem;
+    color: #6c757d;
+}
+
+/* Form group relative for dropdown */
+.modal-body .form-group {
+    position: relative;
+}
+
+/* Required asterisk */
+.required {
+    color: red;
+}
+
+/* Dropdown overrides — replace Bootstrap gray defaults with brand styling */
+.qa-container .dropdown-menu {
+    border: 1px solid #dee2e6;
+    border-radius: 4px;
+    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+    padding: 0.25rem 0;
+    background: #ffffff;
+    z-index: 30;
+}
+
+.qa-container .dropdown-item {
+    font-size: 0.875rem;
+    padding: 0.4rem 0.75rem;
+    color: #495057;
+    background: transparent;
+}
+
+.qa-container .dropdown-item:hover,
+.qa-container .dropdown-item:focus {
+    background: #f0f4ff;
+    color: var(--main-color);
+}
+
+.qa-container .dropdown-item.active,
+.qa-container .dropdown-item:active {
+    background: var(--main-color);
+    color: white;
+}
diff --git a/tcf_website/static/qa/qa_dashboard.js b/tcf_website/static/qa/qa_dashboard.js
new file mode 100644
index 000000000..c67bd4991
--- /dev/null
+++ b/tcf_website/static/qa/qa_dashboard.js
@@ -0,0 +1,1058 @@
+/**
+ * Q&A Dashboard JavaScript
+ * Handles all interactive functionality for the Q&A dashboard.
+ */
+
+document.addEventListener('DOMContentLoaded', function () {
+    initQuestionSelection();
+    initSearch();
+    initCourseFilter();
+    initNewPostModal();
+    initDeleteQuestionModal();
+    initDeleteAnswerModal();
+    initVoting();
+    initAnswerForm();
+    initQuestionActions();
+    initAnswerActions();
+    initReplyForms();
+    initTooltips();
+});
+
+function qaUrl(template, id) {
+    return template.replace('__ID__', String(id));
+}
+
+function showRequestError(message) {
+    window.alert(message);
+}
+
+// ─── Question Selection ───────────────────────────────────────────────────────
+
+function initQuestionSelection() {
+    document.querySelectorAll('.post-item').forEach(item => {
+        if (item.dataset.questionSelectionBound === 'true') return;
+        item.dataset.questionSelectionBound = 'true';
+
+        item.addEventListener('click', function () {
+            const questionId = this.dataset.questionId;
+            loadQuestionDetail(questionId);
+
+            document.querySelectorAll('.post-item').forEach(p => {
+                p.classList.remove('active');
+                p.setAttribute('aria-current', 'false');
+            });
+            this.classList.add('active');
+            this.setAttribute('aria-current', 'true');
+
+            const url = new URL(window.location);
+            url.searchParams.set('question', questionId);
+            window.history.pushState({}, '', url);
+        });
+    });
+}
+
+function loadQuestionDetail(questionId) {
+    const contentArea = document.getElementById('questionContent');
+    contentArea.classList.add('loading');
+
+    fetch(qaUrl(QA_URLS.questionDetail, questionId))
+        .then(r => r.text())
+        .then(html => {
+            contentArea.innerHTML = html;
+            contentArea.classList.remove('loading');
+            // Re-initialise handlers for newly injected HTML
+            initVoting();
+            initAnswerForm();
+            initQuestionActions();
+            initAnswerActions();
+            initReplyForms();
+            initTooltips();
+        })
+        .catch(() => {
+            contentArea.classList.remove('loading');
+            contentArea.innerHTML = '<div class="no-post-selected"><p>Error loading question. Please try again.</p></div>';
+        });
+}
+
+function refreshDashboard(url) {
+    fetch(url.toString(), {
+        headers: { 'X-Requested-With': 'XMLHttpRequest' },
+    })
+        .then(r => r.json())
+        .then(data => {
+            const postsList = document.getElementById('postsList');
+            const contentArea = document.getElementById('questionContent');
+
+            if (postsList) postsList.innerHTML = data.posts_html;
+            if (contentArea) contentArea.innerHTML = data.detail_html;
+
+            initQuestionSelection();
+            initVoting();
+            initAnswerForm();
+            initQuestionActions();
+            initAnswerActions();
+            initReplyForms();
+            initTooltips();
+
+            if (data.selected_question_id) {
+                url.searchParams.set('question', data.selected_question_id);
+            }
+
+            window.history.pushState({}, '', url);
+        })
+        .catch(() => {
+            window.location.href = url.toString();
+        });
+}
+
+// ─── Search ───────────────────────────────────────────────────────────────────
+
+function initSearch() {
+    const input = document.getElementById('searchInput');
+    if (!input) return;
+
+    let timeout;
+    function runSearch() {
+        const q = input.value.trim();
+        const url = new URL(window.location);
+        if (q) url.searchParams.set('q', q);
+        else url.searchParams.delete('q');
+        url.searchParams.delete('question');
+        refreshDashboard(url);
+    }
+
+    input.addEventListener('input', function () {
+        clearTimeout(timeout);
+        timeout = setTimeout(() => {
+            runSearch();
+        }, 500);
+    });
+
+    input.addEventListener('keypress', function (e) {
+        if (e.key === 'Enter') {
+            clearTimeout(timeout);
+            e.preventDefault();
+            runSearch();
+        }
+    });
+}
+
+// ─── Course Filter ────────────────────────────────────────────────────────────
+
+function initCourseFilter() {
+    const departmentSearchInput = document.getElementById('departmentFilterSearch');
+    const departmentItemsList = document.getElementById('departmentFilterList');
+    const courseDropdownContainer = document.getElementById('courseDropdownContainer');
+    const courseSearchInput = document.getElementById('courseFilterSearch');
+    const courseItemsList = document.getElementById('courseFilterList');
+    const departmentLabel = document.getElementById('departmentLabel');
+    const courseLabel = document.getElementById('courseLabel');
+    const departmentDropdownBtn = document.getElementById('departmentDropdown');
+    const courseDropdownBtn = document.getElementById('courseDropdown');
+
+    if (!departmentSearchInput || !departmentItemsList || !courseDropdownContainer || !courseSearchInput || !courseItemsList) return;
+
+    // Get currently selected department from the page
+    let selectedDepartmentId = '';
+    const activeDeptItem = departmentItemsList.querySelector('.dropdown-item.active');
+    if (activeDeptItem && activeDeptItem.dataset.departmentId) {
+        selectedDepartmentId = activeDeptItem.dataset.departmentId;
+    }
+
+    let selectedCourseId = '';
+    let selectedScope = '';
+    const activeCourseItem = courseItemsList.querySelector('.dropdown-item.active');
+    if (activeCourseItem && activeCourseItem.dataset.courseId) {
+        selectedCourseId = activeCourseItem.dataset.courseId;
+    }
+    if (activeCourseItem && activeCourseItem.dataset.scope) {
+        selectedScope = activeCourseItem.dataset.scope;
+    }
+
+    // Show course dropdown if a department is selected
+    if (selectedDepartmentId) {
+        setCourseDropdownVisible(true);
+        filterCoursesByDepartment(selectedDepartmentId);
+    } else {
+        setCourseDropdownVisible(false);
+    }
+
+    updateFilterButtonStates();
+
+    // ─── Department Dropdown Handling ───
+    if (departmentDropdownBtn) {
+        $(departmentDropdownBtn).closest('.dropdown').on('shown.bs.dropdown', function () {
+            departmentSearchInput.value = '';
+            departmentSearchInput.focus();
+            departmentItemsList.querySelectorAll('.dropdown-item').forEach(item => {
+                item.classList.remove('d-none');
+            });
+        });
+    }
+
+    departmentSearchInput.addEventListener('click', function (e) {
+        e.stopPropagation();
+    });
+
+    departmentSearchInput.addEventListener('input', function () {
+        const query = this.value.trim().toLowerCase();
+        departmentItemsList.querySelectorAll('.dropdown-item').forEach(item => {
+            const text = item.textContent.trim().toLowerCase();
+            if (!query || text === 'all departments' || text.includes(query)) {
+                item.classList.remove('d-none');
+            } else {
+                item.classList.add('d-none');
+            }
+        });
+    });
+
+    departmentItemsList.querySelectorAll('.dropdown-item').forEach(item => {
+        item.addEventListener('click', function (e) {
+            const deptId = this.dataset.departmentId;
+            const deptText = this.textContent.trim();
+
+            // Update department label
+            if (departmentLabel) {
+                departmentLabel.textContent = deptText === 'All Departments' ? 'All Departments' : deptText;
+            }
+
+            // Update active state
+            departmentItemsList.querySelectorAll('.dropdown-item').forEach(i => i.classList.remove('active'));
+            this.classList.add('active');
+
+            // Reset course dropdown and show/hide based on selection
+            if (!deptId) {
+                selectedDepartmentId = '';
+                selectedCourseId = '';
+                selectedScope = '';
+                // All Departments selected
+                setCourseDropdownVisible(false);
+                if (courseLabel) courseLabel.textContent = 'All Posts';
+                const url = new URL(window.location);
+                url.searchParams.delete('department');
+                url.searchParams.delete('course');
+                url.searchParams.delete('scope');
+                url.searchParams.delete('question');
+                updateFilterButtonStates();
+                refreshDashboard(url);
+            } else {
+                selectedDepartmentId = deptId;
+                selectedCourseId = '';
+                selectedScope = '';
+                // Specific department selected - show course dropdown
+                setCourseDropdownVisible(true);
+                if (courseLabel) courseLabel.textContent = 'All Posts';
+
+                // Filter and show courses for this department
+                filterCoursesByDepartment(deptId);
+
+                const url = new URL(window.location);
+                url.searchParams.set('department', deptId);
+                url.searchParams.delete('course');
+                url.searchParams.delete('scope');
+                url.searchParams.delete('question');
+                updateFilterButtonStates();
+                refreshDashboard(url);
+            }
+
+            e.preventDefault();
+        });
+    });
+
+    // ─── Course Dropdown Handling ───
+    if (courseDropdownBtn) {
+        $(courseDropdownBtn).closest('.dropdown').on('shown.bs.dropdown', function () {
+            courseSearchInput.value = '';
+            courseSearchInput.focus();
+
+            // Reapply current department filter whenever the menu opens.
+            filterCoursesByDepartment(selectedDepartmentId);
+        });
+    }
+
+    courseSearchInput.addEventListener('click', function (e) {
+        e.stopPropagation();
+    });
+
+    courseSearchInput.addEventListener('input', function () {
+        const query = this.value.trim().toLowerCase();
+        filterCoursesByDepartment(selectedDepartmentId, query);
+    });
+
+    courseItemsList.querySelectorAll('.dropdown-item').forEach(item => {
+        item.addEventListener('click', function (e) {
+            const courseId = this.dataset.courseId;
+            const scope = this.dataset.scope || '';
+            const courseText = this.textContent.trim();
+
+            // Update course label
+            if (courseLabel) {
+                courseLabel.textContent = courseText === 'All Posts' ? 'All Posts' : courseText;
+            }
+
+            // Navigate to the selected course
+            if (courseId) {
+                selectedCourseId = courseId;
+                selectedScope = '';
+                const url = new URL(window.location);
+                if (selectedDepartmentId) {
+                    url.searchParams.set('department', selectedDepartmentId);
+                }
+                url.searchParams.set('course', courseId);
+                url.searchParams.delete('scope');
+                url.searchParams.delete('question');
+                updateFilterButtonStates();
+                refreshDashboard(url);
+            } else if (scope === 'department_broad') {
+                selectedCourseId = '';
+                selectedScope = 'department_broad';
+                const url = new URL(window.location);
+                if (selectedDepartmentId) {
+                    url.searchParams.set('department', selectedDepartmentId);
+                }
+                url.searchParams.delete('course');
+                url.searchParams.set('scope', 'department_broad');
+                url.searchParams.delete('question');
+                updateFilterButtonStates();
+                refreshDashboard(url);
+            } else {
+                selectedCourseId = '';
+                selectedScope = '';
+                // All Posts selected
+                const activeDeptItem = departmentItemsList.querySelector('.dropdown-item.active');
+                const deptId = activeDeptItem ? activeDeptItem.dataset.departmentId : '';
+                if (deptId) {
+                    // Stay in the department but show all courses
+                    const url = new URL(window.location);
+                    url.searchParams.set('department', deptId);
+                    url.searchParams.delete('course');
+                    url.searchParams.delete('scope');
+                    url.searchParams.delete('question');
+                    updateFilterButtonStates();
+                    refreshDashboard(url);
+                } else {
+                    // Shouldn't happen, but go back to all
+                    const url = new URL(window.location);
+                    url.searchParams.delete('department');
+                    url.searchParams.delete('course');
+                    url.searchParams.delete('scope');
+                    url.searchParams.delete('question');
+                    updateFilterButtonStates();
+                    refreshDashboard(url);
+                }
+            }
+
+            e.preventDefault();
+        });
+    });
+
+    function filterCoursesByDepartment(departmentId, searchQuery = '') {
+        const normalizedQuery = searchQuery.trim().toLowerCase();
+        courseItemsList.querySelectorAll('.dropdown-item').forEach(item => {
+            if (!item.dataset.courseId) {
+                // "All Courses" option
+                item.classList.remove('d-none');
+            } else {
+                const sameDepartment = !departmentId || item.dataset.departmentId === departmentId;
+                const text = item.textContent.trim().toLowerCase();
+                const matchesQuery = !normalizedQuery || text.includes(normalizedQuery);
+
+                if (sameDepartment && matchesQuery) {
+                    item.classList.remove('d-none');
+                } else {
+                    item.classList.add('d-none');
+                }
+            }
+        });
+        if (!searchQuery) {
+            courseSearchInput.value = '';
+        }
+    }
+
+    function setCourseDropdownVisible(isVisible) {
+        if (isVisible) {
+            courseDropdownContainer.style.display = 'block';
+            requestAnimationFrame(() => {
+                courseDropdownContainer.classList.add('is-visible');
+            });
+        } else {
+            courseDropdownContainer.classList.remove('is-visible');
+            window.setTimeout(() => {
+                if (!courseDropdownContainer.classList.contains('is-visible')) {
+                    courseDropdownContainer.style.display = 'none';
+                }
+            }, 200);
+        }
+    }
+
+    function updateFilterButtonStates() {
+        if (departmentDropdownBtn) {
+            departmentDropdownBtn.classList.toggle('filter-active', Boolean(selectedDepartmentId));
+        }
+        if (courseDropdownBtn) {
+            courseDropdownBtn.classList.toggle(
+                'filter-active',
+                Boolean(selectedCourseId || selectedScope)
+            );
+        }
+    }
+}
+
+// ─── New Post Modal ───────────────────────────────────────────────────────────
+
+function initNewPostModal() {
+    const modal = document.getElementById('newPostModal');
+    if (!modal) return;
+
+    const openBtn = document.getElementById('openNewPostModal');
+    const closeBtn = document.getElementById('closeModal');
+    const cancelBtn = document.getElementById('cancelModal');
+    const form = document.getElementById('newPostForm');
+    const courseSearchInput = document.getElementById('courseSearch');
+    const courseIdInput = document.getElementById('courseId');
+    const departmentIdInput = document.getElementById('departmentId');
+    const courseResults = document.getElementById('courseResults');
+    const instructorSearchInput = document.getElementById('instructorSearch');
+    const instructorIdInput = document.getElementById('instructorId');
+    const instructorResults = document.getElementById('instructorResults');
+    let instructorOptions = [];
+    let selectedTargetType = 'none';
+    let instructorRequestToken = 0;
+
+    function escapeHtml(value) {
+        return String(value)
+            .replace(/&/g, '&amp;')
+            .replace(/</g, '&lt;')
+            .replace(/>/g, '&gt;')
+            .replace(/"/g, '&quot;')
+            .replace(/'/g, '&#39;');
+    }
+
+    function resetInstructorSearch() {
+        instructorOptions = [];
+        if (instructorIdInput) instructorIdInput.value = '';
+        if (instructorSearchInput) {
+            instructorSearchInput.value = '';
+            instructorSearchInput.disabled = true;
+            instructorSearchInput.placeholder = 'Select a course first...';
+        }
+        if (instructorResults) {
+            instructorResults.classList.remove('show');
+            instructorResults.innerHTML = '';
+        }
+    }
+
+    function setDepartmentMode() {
+        selectedTargetType = 'department';
+        // Invalidate any in-flight instructor request from previous course selection.
+        instructorRequestToken += 1;
+        if (instructorIdInput) instructorIdInput.value = '';
+        if (instructorSearchInput) {
+            instructorSearchInput.value = '';
+            instructorSearchInput.disabled = true;
+            instructorSearchInput.placeholder = 'Instructor not required for department posts';
+        }
+        if (instructorResults) {
+            instructorResults.classList.remove('show');
+            instructorResults.innerHTML = '';
+        }
+    }
+
+    function renderInstructorResults(query = '') {
+        if (!instructorResults || !instructorSearchInput) return;
+
+        const normalizedQuery = query.trim().toLowerCase();
+        const filteredOptions = instructorOptions.filter(instructor =>
+            instructor.name.toLowerCase().includes(normalizedQuery)
+        );
+
+        if (filteredOptions.length === 0) {
+            instructorResults.innerHTML = '<div class="course-result-item text-muted">No instructors found</div>';
+            instructorResults.classList.add('show');
+            return;
+        }
+
+        instructorResults.innerHTML = filteredOptions.map(instructor =>
+            `<div class="course-result-item" data-id="${instructor.id}" data-name="${escapeHtml(instructor.name)}">
+                <div class="course-result-code">${escapeHtml(instructor.name)}</div>
+            </div>`
+        ).join('');
+        instructorResults.classList.add('show');
+
+        instructorResults.querySelectorAll('.course-result-item').forEach(item => {
+            item.addEventListener('click', function () {
+                if (instructorIdInput) instructorIdInput.value = this.dataset.id;
+                instructorSearchInput.value = this.dataset.name;
+                instructorResults.classList.remove('show');
+            });
+        });
+    }
+
+    function openModal() {
+        modal.style.display = 'flex';
+        document.body.style.overflow = 'hidden';
+    }
+
+    function closeModal() {
+        modal.style.display = 'none';
+        document.body.style.overflow = '';
+        if (form) form.reset();
+        if (courseIdInput) courseIdInput.value = '';
+        if (departmentIdInput) departmentIdInput.value = '';
+        selectedTargetType = 'none';
+        instructorRequestToken += 1;
+        if (courseResults) courseResults.classList.remove('show');
+        resetInstructorSearch();
+    }
+
+    if (openBtn) openBtn.addEventListener('click', openModal);
+    if (closeBtn) closeBtn.addEventListener('click', closeModal);
+    if (cancelBtn) cancelBtn.addEventListener('click', closeModal);
+    modal.addEventListener('click', e => { if (e.target === modal) closeModal(); });
+
+    // Course search autocomplete
+    if (courseSearchInput) {
+        let searchTimeout;
+        courseSearchInput.addEventListener('input', function () {
+            if (courseIdInput) courseIdInput.value = '';
+            if (departmentIdInput) departmentIdInput.value = '';
+            selectedTargetType = 'none';
+            instructorRequestToken += 1;
+            resetInstructorSearch();
+            clearTimeout(searchTimeout);
+            const q = this.value.trim();
+            if (q.length < 2) {
+                courseResults.classList.remove('show');
+                return;
+            }
+            searchTimeout = setTimeout(() => {
+                fetch(`${QA_URLS.searchCourses}?q=${encodeURIComponent(q)}`)
+                    .then(r => r.json())
+                    .then(data => {
+                        if (data.results && data.results.length > 0) {
+                            courseResults.innerHTML = data.results.map(c => {
+                                const id = escapeHtml(c.id);
+                                const code = escapeHtml(c.code);
+                                const type = escapeHtml(c.type);
+                                const title = escapeHtml(c.title);
+                                return `<div class="course-result-item" data-id="${id}" data-code="${code}" data-type="${type}">
+                                    <div class="course-result-code">${code}</div>
+                                    <div class="course-result-title">${title}</div>
+                                </div>`
+                            }).join('');
+                            courseResults.classList.add('show');
+
+                            courseResults.querySelectorAll('.course-result-item').forEach(item => {
+                                item.addEventListener('click', function () {
+                                    courseSearchInput.value = this.dataset.code;
+                                    courseResults.classList.remove('show');
+                                    if (this.dataset.type === 'course') {
+                                        selectedTargetType = 'course';
+                                        courseIdInput.value = this.dataset.id;
+                                        if (departmentIdInput) departmentIdInput.value = '';
+                                        resetInstructorSearch();
+                                        const requestToken = ++instructorRequestToken;
+                                        loadInstructors(this.dataset.id, requestToken);
+                                    } else {
+                                        if (courseIdInput) courseIdInput.value = '';
+                                        if (departmentIdInput) departmentIdInput.value = this.dataset.id;
+                                        setDepartmentMode();
+                                    }
+                                });
+                            });
+                        } else {
+                            courseResults.innerHTML = '<div class="course-result-item text-muted">No courses found</div>';
+                            courseResults.classList.add('show');
+                        }
+                    });
+            }, 300);
+        });
+
+        courseSearchInput.addEventListener('keydown', function (e) {
+            if (e.key === 'Backspace' && courseIdInput.value) {
+                courseIdInput.value = '';
+                selectedTargetType = 'none';
+                instructorRequestToken += 1;
+                resetInstructorSearch();
+            }
+            if (e.key === 'Backspace' && departmentIdInput && departmentIdInput.value) {
+                departmentIdInput.value = '';
+                selectedTargetType = 'none';
+                instructorRequestToken += 1;
+                resetInstructorSearch();
+            }
+        });
+
+        document.addEventListener('click', function (e) {
+            if (!courseSearchInput.contains(e.target) && !courseResults.contains(e.target)) {
+                courseResults.classList.remove('show');
+            }
+        });
+    }
+
+    if (instructorSearchInput && instructorResults) {
+        instructorSearchInput.addEventListener('click', function (e) {
+            e.stopPropagation();
+            if (!this.disabled) {
+                renderInstructorResults(this.value);
+            }
+        });
+
+        instructorSearchInput.addEventListener('input', function () {
+            if (instructorIdInput) instructorIdInput.value = '';
+            if (this.disabled) return;
+            renderInstructorResults(this.value);
+        });
+
+        document.addEventListener('click', function (e) {
+            if (!instructorSearchInput.contains(e.target) && !instructorResults.contains(e.target)) {
+                instructorResults.classList.remove('show');
+            }
+        });
+    }
+
+    function loadInstructors(courseId, requestToken) {
+        if (!instructorSearchInput || !instructorResults) return;
+        instructorSearchInput.disabled = true;
+        instructorSearchInput.placeholder = 'Loading instructors...';
+        instructorSearchInput.value = '';
+        instructorResults.classList.remove('show');
+        instructorResults.innerHTML = '<div class="course-result-item text-muted">Loading instructors...</div>';
+        instructorResults.classList.add('show');
+
+        fetch(qaUrl(QA_URLS.getInstructors, courseId))
+            .then(r => r.json())
+            .then(data => {
+                if (requestToken !== instructorRequestToken || selectedTargetType !== 'course') {
+                    return;
+                }
+                instructorOptions = data.instructors || [];
+                instructorSearchInput.disabled = false;
+                instructorSearchInput.placeholder = instructorOptions.length > 0 ? 'Search instructors...' : 'No instructors found';
+                instructorSearchInput.focus();
+
+                if (instructorOptions.length > 0) {
+                    renderInstructorResults('');
+                } else {
+                    instructorResults.innerHTML = '<div class="course-result-item text-muted">No instructors found</div>';
+                    instructorResults.classList.add('show');
+                }
+            })
+            .catch(() => {
+                if (requestToken !== instructorRequestToken || selectedTargetType !== 'course') {
+                    return;
+                }
+                instructorOptions = [];
+                instructorSearchInput.disabled = false;
+                instructorSearchInput.placeholder = 'Error loading instructors';
+                instructorResults.innerHTML = '<div class="course-result-item text-muted">Error loading instructors</div>';
+                instructorResults.classList.add('show');
+            });
+    }
+
+    if (form) {
+        form.addEventListener('submit', function (e) {
+            const hasCourse = courseIdInput && courseIdInput.value;
+            const hasDepartment = departmentIdInput && departmentIdInput.value;
+
+            if (!hasCourse && !hasDepartment) {
+                e.preventDefault();
+                courseSearchInput.focus();
+                courseSearchInput.setCustomValidity('Please select a course or a department.');
+                courseSearchInput.reportValidity();
+                return;
+            }
+
+            courseSearchInput.setCustomValidity('');
+
+            if (hasDepartment && instructorIdInput) {
+                instructorIdInput.value = '';
+            }
+            if (hasDepartment && courseIdInput) {
+                courseIdInput.value = '';
+            }
+        });
+    }
+}
+
+// ─── Delete Question Modal ────────────────────────────────────────────────────
+
+let questionIdToDelete = null;
+
+function initDeleteQuestionModal() {
+    const confirmDeleteBtn = document.getElementById('confirmDeleteQuestion');
+
+    if (confirmDeleteBtn) {
+        confirmDeleteBtn.addEventListener('click', function () {
+            if (!questionIdToDelete) return;
+
+            const deleteData = new FormData();
+            deleteData.append('csrfmiddlewaretoken', CSRF_TOKEN);
+            fetch(qaUrl(QA_URLS.deleteQuestion, questionIdToDelete), {
+                method: 'POST',
+                headers: {
+                    'X-CSRFToken': CSRF_TOKEN,
+                    'X-Requested-With': 'XMLHttpRequest',
+                },
+                body: deleteData,
+            })
+            .then(r => {
+                if (!r.ok) throw new Error(r.status);
+                return r;
+            })
+            .then(() => {
+                $('#deleteQuestionModal').modal('hide');
+                window.location.href = QA_URLS.dashboard;
+            })
+            .catch(err => {
+                console.error('Delete question error:', err);
+                showRequestError('Unable to delete the question right now. Please try again.');
+            });
+        });
+    }
+}
+
+function openDeleteQuestionModal(qId) {
+    questionIdToDelete = qId;
+    $('#deleteQuestionModal').modal('show');
+}
+
+// ─── Delete Answer Modal ──────────────────────────────────────────────────────
+
+let answerIdToDelete = null;
+
+function initDeleteAnswerModal() {
+    const confirmDeleteBtn = document.getElementById('confirmDeleteAnswer');
+
+    if (confirmDeleteBtn) {
+        confirmDeleteBtn.addEventListener('click', function () {
+            if (!answerIdToDelete) return;
+
+            const deleteData = new FormData();
+            deleteData.append('csrfmiddlewaretoken', CSRF_TOKEN);
+            fetch(qaUrl(QA_URLS.deleteAnswer, answerIdToDelete), {
+                method: 'POST',
+                headers: {
+                    'X-CSRFToken': CSRF_TOKEN,
+                    'X-Requested-With': 'XMLHttpRequest',
+                },
+                body: deleteData,
+            })
+            .then(r => {
+                if (!r.ok) throw new Error(r.status);
+                return r;
+            })
+            .then(() => {
+                $('#deleteAnswerModal').modal('hide');
+                const url = new URL(window.location);
+                const qId = url.searchParams.get('question');
+                const activeItem = document.querySelector('.post-item.active');
+                const questionId = qId || (activeItem && activeItem.dataset.questionId);
+                if (questionId) loadQuestionDetail(questionId);
+            })
+            .catch(err => {
+                console.error('Delete answer error:', err);
+                showRequestError('Unable to delete the answer right now. Please try again.');
+            });
+        });
+    }
+}
+
+function openDeleteAnswerModal(aId) {
+    answerIdToDelete = aId;
+    $('#deleteAnswerModal').modal('show');
+}
+
+// ─── Voting ───────────────────────────────────────────────────────────────────
+
+function initVoting() {
+    document.querySelectorAll('.vote-btn').forEach(btn => {
+        if (btn.dataset.votingBound === 'true') return;
+        btn.dataset.votingBound = 'true';
+
+        btn.addEventListener('click', function () {
+            if (!IS_AUTHENTICATED) {
+                window.location.href = '/login/';
+                return;
+            }
+
+            const type = this.dataset.type;   // 'question' or 'answer'
+            const id = this.dataset.id;
+
+            const url = type === 'question'
+                ? qaUrl(QA_URLS.upvoteQuestion, id)
+                : qaUrl(QA_URLS.upvoteAnswer, id);
+                
+            const counterId = type === 'question'
+                ? `question-vote-count-${id}`
+                : `answer-vote-count-${id}`;
+
+            fetch(url, {
+                method: 'POST',
+                headers: { 'X-CSRFToken': CSRF_TOKEN },
+            })
+            .then(r => {
+                if (!r.ok) throw new Error(r.status);
+                return r.json();
+            })
+            .then(data => {
+                if (data.ok) {
+                    const container = this.closest('.post-actions');
+                    const upBtn = container
+                        ? container.querySelector('[data-action="up"]')
+                        : this;
+                    const counterEl = document.getElementById(counterId);
+
+                    if (upBtn) upBtn.classList.toggle('voted', data.user_vote === 1);
+                    if (counterEl) counterEl.textContent = data.votes;
+
+                    // Keep sidebar list in sync for question votes
+                    if (type === 'question') {
+                        const sidebarContainer = document.querySelector(`#sidebar-vote-count-${id}`);
+                        if (sidebarContainer) {
+                            const sidebarNum = sidebarContainer.querySelector('.sidebar-vote-num');
+                            if(sidebarNum) sidebarNum.textContent = data.votes;
+                            sidebarContainer.classList.toggle('voted', data.user_vote === 1)
+                        }
+                    }
+                }
+            })
+            .catch(err => {
+                console.error('Vote error:', err);
+                showRequestError('Unable to record your vote right now. Please try again.');
+            });
+        });
+    });
+}
+
+// ─── Answer Form ──────────────────────────────────────────────────────────────
+
+function initAnswerForm() {
+    const form = document.getElementById('mainAnswerForm');
+    if (!form) return;
+
+    const newForm = form.cloneNode(true);
+    form.parentNode.replaceChild(newForm, form);
+
+    newForm.addEventListener('submit', function (e) {
+        e.preventDefault();
+
+        const formData = new FormData(newForm);
+        const submitBtn = newForm.querySelector('.btn-submit-reply');
+
+        if (submitBtn) {
+            submitBtn.disabled = true;
+            submitBtn.textContent = 'Posting...';
+        }
+
+        fetch(newForm.action, {
+            method: 'POST',
+            body: formData,
+            headers: { 'X-Requested-With': 'XMLHttpRequest' },
+        })
+        .then(r => {
+            if (!r.ok) throw new Error(r.status);
+            return r;
+        })
+        .then(() => {
+            incrementAnswerCount();
+            // Reload the current question detail
+            const url = new URL(window.location);
+            const questionId = url.searchParams.get('question');
+            const activeItem = document.querySelector('.post-item.active');
+            const qId = questionId || (activeItem && activeItem.dataset.questionId);
+            if (qId) loadQuestionDetail(qId);
+        })
+        .catch(err => {
+            console.error('Answer submit error:', err);
+            showRequestError('Unable to post your answer right now. Please try again.');
+        })
+        .finally(() => {
+            if (submitBtn) {
+                submitBtn.disabled = false;
+                submitBtn.textContent = 'Post Answer';
+            }
+        });
+    });
+}
+
+function incrementAnswerCount() {
+    const counter = document.querySelector('.response-count');
+    if (!counter) return;
+
+    const match = counter.textContent.match(/\d+/);
+    if (!match) return;
+
+    counter.textContent = `(${parseInt(match[0], 10) + 1})`;
+}
+
+function initTooltips() {
+    if (typeof $ !== 'function') return;
+    $('[data-toggle="tooltip"]').tooltip();
+}
+
+// ─── Question Actions (Edit / Delete) ────────────────────────────────────────
+
+function initQuestionActions() {
+    const editModal = document.getElementById('editQuestionModal');
+
+    document.querySelectorAll('.edit-question-btn').forEach(btn => {
+        if (btn.dataset.questionActionBound === 'true') return;
+        btn.dataset.questionActionBound = 'true';
+        btn.addEventListener('click', function (e) {
+            e.preventDefault();
+            if (!editModal) return;
+
+            const qId = this.dataset.questionId;
+            document.getElementById('editTitle').value = this.dataset.title || '';
+            document.getElementById('editText').value = this.dataset.text || '';
+            document.getElementById('editCourse').value = this.dataset.course || '';
+            document.getElementById('editDepartment').value = this.dataset.department || '';
+            document.getElementById('editInstructor').value = this.dataset.instructor || '';
+            document.getElementById('editQuestionForm').action = qaUrl(QA_URLS.editQuestion, qId);
+
+            editModal.style.display = 'flex';
+            document.body.style.overflow = 'hidden';
+        });
+    });
+
+    const closeEditBtn = document.getElementById('closeEditModal');
+    const cancelEditBtn = document.getElementById('cancelEditModal');
+    function closeEditModal() {
+        if (editModal) {
+            editModal.style.display = 'none';
+            document.body.style.overflow = '';
+        }
+    }
+    if (closeEditBtn && closeEditBtn.dataset.modalBound !== 'true') {
+        closeEditBtn.dataset.modalBound = 'true';
+        closeEditBtn.addEventListener('click', closeEditModal);
+    }
+    if (cancelEditBtn && cancelEditBtn.dataset.modalBound !== 'true') {
+        cancelEditBtn.dataset.modalBound = 'true';
+        cancelEditBtn.addEventListener('click', closeEditModal);
+    }
+    if (editModal && editModal.dataset.modalBound !== 'true') {
+        editModal.dataset.modalBound = 'true';
+        editModal.addEventListener('click', e => { if (e.target === editModal) closeEditModal(); });
+    }
+
+    // Delete question button handler
+    document.querySelectorAll('.delete-question-btn').forEach(btn => {
+        if (btn.dataset.deleteQuestionBound === 'true') return;
+        btn.dataset.deleteQuestionBound = 'true';
+        btn.addEventListener('click', function (e) {
+            e.preventDefault();
+            const qId = this.dataset.questionId;
+            openDeleteQuestionModal(qId);
+        });
+    });
+}
+
+// ─── Answer Actions (Edit / Delete) ──────────────────────────────────────────
+
+function initAnswerActions() {
+    const editAnswerModal = document.getElementById('editAnswerModal');
+
+    document.querySelectorAll('.edit-answer-btn').forEach(btn => {
+        if (btn.dataset.answerActionBound === 'true') return;
+        btn.dataset.answerActionBound = 'true';
+        btn.addEventListener('click', function (e) {
+            e.preventDefault();
+            if (!editAnswerModal) return;
+
+            const answerId = this.dataset.answerId;
+            document.getElementById('editAnswerText').value = this.dataset.text || '';
+            const semSelect = document.getElementById('editAnswerSemester');
+            if (semSelect) semSelect.value = this.dataset.semester || '';
+            const mainForm = document.getElementById('mainAnswerForm');
+            const questionId = mainForm ? mainForm.querySelector('[name="question"]').value : '';
+            document.getElementById('editAnswerQuestion').value = questionId;
+            document.getElementById('editAnswerForm').action = qaUrl(QA_URLS.editAnswer, answerId);
+
+            editAnswerModal.style.display = 'flex';
+            document.body.style.overflow = 'hidden';
+        });
+    });
+
+    function closeEditAnswerModal() {
+        if (editAnswerModal) {
+            editAnswerModal.style.display = 'none';
+            document.body.style.overflow = '';
+        }
+    }
+    const closeBtn = document.getElementById('closeEditAnswerModal');
+    const cancelBtn = document.getElementById('cancelEditAnswerModal');
+    if (closeBtn && closeBtn.dataset.modalBound !== 'true') {
+        closeBtn.dataset.modalBound = 'true';
+        closeBtn.addEventListener('click', closeEditAnswerModal);
+    }
+    if (cancelBtn && cancelBtn.dataset.modalBound !== 'true') {
+        cancelBtn.dataset.modalBound = 'true';
+        cancelBtn.addEventListener('click', closeEditAnswerModal);
+    }
+    if (editAnswerModal && editAnswerModal.dataset.modalBound !== 'true') {
+        editAnswerModal.dataset.modalBound = 'true';
+        editAnswerModal.addEventListener('click', e => {
+            if (e.target === editAnswerModal) closeEditAnswerModal();
+        });
+    }
+
+    document.querySelectorAll('.delete-answer-btn').forEach(btn => {
+        if (btn.dataset.deleteAnswerBound === 'true') return;
+        btn.dataset.deleteAnswerBound = 'true';
+        btn.addEventListener('click', function (e) {
+            e.preventDefault();
+            const answerId = this.dataset.answerId;
+            openDeleteAnswerModal(answerId);
+        });
+    });
+}
+
+// ─── Reply Forms ──────────────────────────────────────────────────────────────
+
+function initReplyForms() {
+    // Handle Reply button clicks
+    document.querySelectorAll('.reply-btn').forEach(btn => {
+        if (btn.dataset.replyBound === 'true') return;
+        btn.dataset.replyBound = 'true';
+
+        btn.addEventListener('click', function (e) {
+            e.preventDefault();
+            const answerId = this.dataset.answerId;
+            const replyForm = document.getElementById(`reply-form-${answerId}`);
+
+            // Hide all other reply forms
+            document.querySelectorAll('.reply-form-container').forEach(form => {
+                if (form.id !== `reply-form-${answerId}`) {
+                    form.style.display = 'none';
+                }
+            });
+
+            // Toggle this reply form
+            if (replyForm) {
+                replyForm.style.display = replyForm.style.display === 'none' ? 'block' : 'none';
+            }
+        });
+    });
+
+    // Handle Cancel button clicks
+    document.querySelectorAll('.btn-cancel-reply').forEach(btn => {
+        if (btn.dataset.replyCancelBound === 'true') return;
+        btn.dataset.replyCancelBound = 'true';
+
+        btn.addEventListener('click', function (e) {
+            e.preventDefault();
+            const replyForm = this.closest('.reply-form-container');
+            if (replyForm) {
+                replyForm.style.display = 'none';
+                // Clear the form
+                const form = replyForm.querySelector('form');
+                if (form) {
+                    form.querySelector('textarea').value = '';
+                    form.querySelector('select').selectedIndex = 0;
+                }
+            }
+        });
+    });
+}
diff --git a/tcf_website/templates/base/sidebar.html b/tcf_website/templates/base/sidebar.html
index 5a50bd131..4d941670b 100644
--- a/tcf_website/templates/base/sidebar.html
+++ b/tcf_website/templates/base/sidebar.html
@@ -38,6 +38,33 @@ <h4>
       </a>
       {% endif %}
     </li>
+
+    <li>
+      {% if user.is_authenticated %}
+      <a href="{% url 'qa' %}"
+        class="list-group-item list-group-item-action pb-0
+        {% if request.resolver_match.url_name == 'qa' %}active{% endif %}">
+        <span class="position-absolute top-0 start-0 translate-middle badge rounded-pill bg-info" style="top: 12px; left: 80px; transform: translate(-50%, -50%);">New</span>
+        <h4> 
+          <i class="fa fa-comments" aria-hidden="true" style="width: 1em; height: 1em; vertical-align: middle; display: inline-block; filter: invert(100%) brightness(150%);"></i>
+        </h4>
+        <p>Q&A</p>
+        <hr>
+      </a>
+      {% else %}
+      <a href="#loginModal" data-toggle="modal"
+       class="list-group-item list-group-item-action pb-0
+       {% if request.resolver_match.url_name == 'qa' %}active{% endif %}">
+       <span class="position-absolute top-0 start-0 translate-middle badge rounded-pill bg-info" style="top: 12px; left: 80px; transform: translate(-50%, -50%);">New</span>
+      <h4>
+        <i class="fa fa-comments" aria-hidden="true" style="width: 1em; height: 1em; vertical-align: middle; display: inline-block; filter: invert(100%) brightness(150%);"></i>
+      </h4>
+      <p>Q&A</p>
+      <hr>
+      </a>
+      {% endif %}
+    </li>
+
     <li>
       {% if user.is_authenticated %}
 
diff --git a/tcf_website/templates/qa/_answer_item.html b/tcf_website/templates/qa/_answer_item.html
new file mode 100644
index 000000000..66bb8c7bc
--- /dev/null
+++ b/tcf_website/templates/qa/_answer_item.html
@@ -0,0 +1,101 @@
+<div class="thread-post {% if answer.depth > 0 %}is-reply{% endif %} thread-depth-{{ answer.render_depth }}" data-answer-id="{{ answer.id }}" data-depth="{{ answer.depth }}">
+    <div class="post-main">
+        <div class="post-header-info">
+            <div class="answer-header-left">
+                {% if answer.semester %}
+                <span class="semester-tag">{{ answer.semester }}</span>
+                {% else %}
+                <span class="semester-tag">Not Taken</span>
+                {% endif %}
+                <span class="post-time">{{ answer.created|timesince }} ago</span>
+            </div>
+            {% if user.is_authenticated and user == answer.user and not answer.is_deleted_placeholder %}
+            <div class="answer-header-actions">
+                <button class="action-btn-sm edit-answer-btn"
+                        title="Edit"
+                        data-answer-id="{{ answer.id }}"
+                        data-text="{{ answer.text }}"
+                        data-semester="{{ answer.semester.id|default:'' }}">
+                    <i class="fa fa-pencil"></i>
+                </button>
+                <button class="action-btn-sm delete-answer-btn"
+                        title="Delete"
+                        data-answer-id="{{ answer.id }}">
+                    <i class="fa fa-trash-o"></i>
+                </button>
+            </div>
+            {% endif %}
+        </div>
+        <div class="post-body">
+            {% if answer.is_deleted_placeholder %}
+            <p><em>[deleted]</em></p>
+            {% else %}
+            {{ answer.text|linebreaks }}
+            {% endif %}
+        </div>
+        <div class="post-actions">
+            {% if answer.is_deleted_placeholder %}
+            <span class="vote-display">
+                <i class="fa fa-thumbs-up"></i> {{ answer.sum_a_votes|default:0 }}
+            </span>
+            {% if user.is_authenticated %}
+            <button class="action-btn reply-btn" data-answer-id="{{ answer.id }}">
+                <i class="fa fa-reply"></i> Reply
+            </button>
+            {% endif %}
+            {% elif user.is_authenticated %}
+            <button class="action-btn vote-btn {% if answer.user_a_vote == 1 %}voted{% endif %}"
+                    data-type="answer"
+                    data-id="{{ answer.id }}"
+                    data-action="up">
+                <i class="fa fa-thumbs-up"></i>
+                <span class="vote-count" id="answer-vote-count-{{ answer.id }}">{{ answer.sum_a_votes|default:0 }}</span>
+            </button>
+            <button class="action-btn reply-btn" data-answer-id="{{ answer.id }}">
+                <i class="fa fa-reply"></i> Reply
+            </button>
+            {% else %}
+            <span class="vote-display">
+                <i class="fa fa-thumbs-up"></i> {{ answer.sum_a_votes|default:0 }}
+            </span>
+            {% endif %}
+        </div>
+    </div>
+
+    {% if user.is_authenticated %}
+    <div class="reply-form-container thread-depth-{{ answer.render_depth }}" id="reply-form-{{ answer.id }}" style="display: none;">
+        <form class="reply-form" method="POST" action="{% url 'new_reply' %}">
+            {% csrf_token %}
+            <input type="hidden" name="question" value="{{ question.id }}">
+            <input type="hidden" name="parent_answer" value="{{ answer.id }}">
+            <div class="reply-input-wrapper">
+                <div class="reply-form-row mb-2">
+                    <select name="semester" class="form-control semester-select">
+                        <option value="">Select a semester</option>
+                        <option value="">Not Taken</option>
+                        {% for semester in semesters %}
+                        <option value="{{ semester.id }}">{{ semester }}</option>
+                        {% endfor %}
+                    </select>
+                </div>
+                <textarea class="reply-textarea"
+                          name="text"
+                          placeholder="Write your reply..."
+                          required></textarea>
+                <div class="d-flex align-items-center mt-2">
+                    <button type="submit" class="btn-submit-reply">Post Reply</button>
+                    <button type="button" class="btn-cancel-reply ml-2">Cancel</button>
+                </div>
+            </div>
+        </form>
+    </div>
+    {% endif %}
+</div>
+
+{% if answer.nested_replies %}
+<div class="replies-container thread-depth-{{ answer.render_depth }}">
+    {% for reply in answer.nested_replies %}
+    {% include 'qa/_answer_item.html' with answer=reply question=question semesters=semesters %}
+    {% endfor %}
+</div>
+{% endif %}
diff --git a/tcf_website/templates/qa/_question_content.html b/tcf_website/templates/qa/_question_content.html
new file mode 100644
index 000000000..7808dc1f8
--- /dev/null
+++ b/tcf_website/templates/qa/_question_content.html
@@ -0,0 +1,8 @@
+{% if selected_question %}
+{% include 'qa/_question_detail.html' with question=selected_question answers=answers semesters=semesters %}
+{% else %}
+<div class="no-post-selected">
+    <i class="fa fa-comments fa-3x mb-3"></i>
+    <p>Select a question to view its details</p>
+</div>
+{% endif %}
diff --git a/tcf_website/templates/qa/_question_detail.html b/tcf_website/templates/qa/_question_detail.html
new file mode 100644
index 000000000..884942834
--- /dev/null
+++ b/tcf_website/templates/qa/_question_detail.html
@@ -0,0 +1,164 @@
+{% load static %}
+
+<!-- Top Navigation -->
+<div class="content-nav">
+    <div class="post-info">
+        {% if question.course %}
+        <h3>
+            <a class="course-link"
+               href="{% url 'course' mnemonic=question.course.subdepartment.mnemonic course_number=question.course.number %}"
+               tabindex="0"
+               data-toggle="tooltip"
+               data-placement="bottom"
+               title="View course page">
+                {{ question.course.subdepartment.mnemonic }} {{ question.course.number }}
+            </a>
+        </h3>
+        {% elif question.department %}
+        <h3>
+            <a class="course-link"
+               href="{% url 'department' dept_id=question.department.id %}"
+               tabindex="0"
+               data-toggle="tooltip"
+               data-placement="bottom"
+               title="View department page">
+                {{ question.department.name }}
+            </a>
+        </h3>
+        {% endif %}
+        <div class="instructor">
+            {% if question.instructor %}
+            <a class="instructor-profile"
+               href="{% url 'instructor' instructor_id=question.instructor.id %}">
+                <h6 class="m-0 text-tcf-indigo qa-instructor-link"
+                    tabindex="0"
+                    data-toggle="tooltip"
+                    data-placement="bottom"
+                    title="View instructor profile">
+                    <i class="fa fa-user" aria-hidden="true"></i>
+                    <span class="instructor-select">{{ question.instructor.last_name }}, {{ question.instructor.first_name }}</span>
+                </h6>
+            </a>
+            {% endif %}
+        </div>
+    </div>
+</div>
+
+<!-- Post Content -->
+<div class="post-content">
+    <!-- Main Question -->
+    <div class="main-question">
+        <div class="question-header-wrapper">
+            <div class="question-header-content">
+                <h2 class="post-content-title">
+                    {% if question.is_deleted %}
+                    <em>[deleted]</em>
+                    {% else %}
+                    {{ question.title|default:"(No title)" }}
+                    {% endif %}
+                </h2>
+                <div class="post-meta">
+                    <span class="post-timestamp" style="display: inline-flex; align-items: center; gap: 0.25rem;">
+                        <i class="fa fa-clock"></i> {{ question.created|timesince }} ago
+                    </span>
+                </div>
+            </div>
+        </div>
+        <div class="post-body">
+            {% if question.is_deleted %}
+            <p><em>[deleted]</em></p>
+            {% else %}
+            {{ question.text|linebreaks }}
+            {% endif %}
+        </div>
+
+        <!-- Question Vote Actions -->
+        <div class="post-actions">
+            {% if question.is_deleted %}
+            <span class="vote-display">
+                <i class="fa fa-thumbs-up"></i> {{ question.sum_q_votes|default:0 }}
+            </span>
+            {% elif user.is_authenticated %}
+            <button class="action-btn vote-btn {% if question.user_q_vote == 1 %}voted{% endif %}"
+                    data-type="question"
+                    data-id="{{ question.id }}"
+                    data-action="up">
+                <i class="fa fa-thumbs-up"></i>
+                <span class="vote-count" id="question-vote-count-{{ question.id }}">{{ question.sum_q_votes|default:0 }}</span>
+            </button>
+
+            {% if user == question.user %}
+            <span class="question-actions-divider"></span>
+            <button class="action-btn edit-question-btn"
+                    data-question-id="{{ question.id }}"
+                    data-title="{{ question.title }}"
+                    data-text="{{ question.text }}"
+                    data-course="{{ question.course_id|default_if_none:'' }}"
+                    data-department="{{ question.department_id|default_if_none:'' }}"
+                    data-instructor="{{ question.instructor_id|default_if_none:'' }}">
+                <i class="fa fa-pencil"></i> Edit
+            </button>
+            <button class="action-btn delete-question-btn text-danger"
+                    data-question-id="{{ question.id }}">
+                <i class="fa fa-trash-o"></i> Delete
+            </button>
+            {% endif %}
+            {% else %}
+            <span class="vote-display">
+                <i class="fa fa-thumbs-up"></i> {{ question.sum_q_votes|default:0 }}
+            </span>
+            {% endif %}
+        </div>
+    </div>
+
+    <!-- Answers Section -->
+    <div class="comments-section">
+        <h3 class="comments-header">
+            Answers
+            <span class="response-count">({{ answer_count }})</span>
+        </h3>
+
+        <div class="thread-container" id="answersContainer">
+            {% for answer in answers %}
+            {% include 'qa/_answer_item.html' with answer=answer question=question semesters=semesters %}
+            {% if not forloop.last %}<hr>{% endif %}
+            {% empty %}
+            <div class="no-responses">
+                <p>No answers yet. Be the first to answer!</p>
+            </div>
+            {% endfor %}
+        </div>
+    </div>
+
+    <!-- Answer Submission Form -->
+    {% if user.is_authenticated %}
+    <div class="reply-input-container">
+        <form id="mainAnswerForm" method="POST" action="{% url 'new_answer' %}">
+            {% csrf_token %}
+            <input type="hidden" name="question" value="{{ question.id }}">
+            <div class="reply-input-wrapper">
+                <div class="reply-form-row mb-2">
+                    <select name="semester" class="form-control semester-select">
+                        <option value="">Select a semester</option>
+                        <option value="">Not Taken</option>
+                        {% for semester in semesters %}
+                        <option value="{{ semester.id }}">{{ semester }}</option>
+                        {% endfor %}
+                    </select>
+                </div>
+                <textarea class="reply-textarea"
+                          name="text"
+                          placeholder="Write your answer..."
+                          required></textarea>
+                <div class="d-flex align-items-center mt-2">
+                    <button type="submit" class="btn-submit-reply ml-auto">Post Answer</button>
+                </div>
+            </div>
+        </form>
+    </div>
+    {% else %}
+    <div class="login-prompt">
+        <a href="{% url 'login' %}">Login</a> to post an answer.
+    </div>
+    {% endif %}
+</div>
diff --git a/tcf_website/templates/qa/_question_list.html b/tcf_website/templates/qa/_question_list.html
new file mode 100644
index 000000000..264397b30
--- /dev/null
+++ b/tcf_website/templates/qa/_question_list.html
@@ -0,0 +1,43 @@
+{% for question in questions %}
+<button type="button"
+        class="post-item {% if selected_question and selected_question.id == question.id %}active{% endif %}"
+        data-question-id="{{ question.id }}"
+        {% if selected_question and selected_question.id == question.id %}aria-current="true"{% else %}aria-current="false"{% endif %}>
+    <div class="post-header">
+        <span class="post-tag">
+            {% if question.course %}
+            {{ question.course.subdepartment.mnemonic }} {{ question.course.number }}
+            {% elif question.department %}
+            {{ question.department.name }}
+            {% else %}
+            General
+            {% endif %}
+        </span>
+        <span class="post-date">{{ question.created|date:"n/j/y" }}</span>
+    </div>
+    <div class="post-title">
+        {% if question.is_deleted %}
+        <em>[deleted]</em>
+        {% else %}
+        {{ question.title|default:question.text|truncatechars:60 }}
+        {% endif %}
+    </div>
+    <div class="post-preview">
+        {% if question.is_deleted %}
+        <em>[deleted]</em>
+        {% else %}
+        {{ question.text|truncatechars:80 }}
+        {% endif %}
+    </div>
+    <div class="post-footer">
+        <span class="post-stats {% if question.user_q_vote == 1 %}voted{% endif %}" id="sidebar-vote-count-{{ question.id }}">
+            <i class="fa fa-thumbs-up"></i> <span class="sidebar-vote-num">{{ question.sum_q_votes|default:0 }}</span>
+        </span>
+    </div>
+</button>
+{% empty %}
+<div class="no-posts">
+    <i class="fa fa-comments-o fa-3x mb-3"></i>
+    <p>No questions found.</p>
+</div>
+{% endfor %}
diff --git a/tcf_website/templates/qa/qa.html b/tcf_website/templates/qa/qa.html
index 43b782c7b..baad78d21 100644
--- a/tcf_website/templates/qa/qa.html
+++ b/tcf_website/templates/qa/qa.html
@@ -104,12 +104,18 @@ <h6 id="date" class="text-muted">Updated {{ question.created|date:"n/d/y" }}</h6
                                             </div>
                                             <div class="question-content mb-2">
                                                 <div class="question-text-body" id="questionText{{question.id}}">
-                                                    <div class="question-text-full text-break">{{ question.text|linebreaks }}</div>
+                                                    <div class="question-text-full text-break">
+                                                        {% if question.is_deleted %}
+                                                        <em>[deleted]</em>
+                                                        {% else %}
+                                                        {{ question.text|linebreaks }}
+                                                        {% endif %}
+                                                    </div>
                                                 </div>
                                             </div>
                                             <div class="question-footer mt-3">
                                                 <div class="d-flex justify-content-end">
-                                                {% if question.user == user %}
+                                                {% if question.user == user and not question.is_deleted %}
                                                     <div class="question-actions d-inline-flex">
                                                         <a data-toggle="modal" class="question-edit h5 px-2 text-tcf-blue" type="button" 
                                                             data-target="#edit-question-modal{{question.id}}" id="edit-question-button{{question_id}}">
@@ -183,7 +189,13 @@ <h6 id="date" class="text-muted">Updated {{ answer.created|date:"n/d/y" }}</h6>
                                                             </div>
                                                         </div>
                                                         <div class="answer-content">
-                                                            <p>{{ answer.text }}</p>
+                                                            <p>
+                                                                {% if answer.is_deleted %}
+                                                                <em>[deleted]</em>
+                                                                {% else %}
+                                                                {{ answer.text }}
+                                                                {% endif %}
+                                                            </p>
                                                         </div>
                                                         <div class="d-flex answer-footer justify-content-between">
                                                             <div
@@ -206,7 +218,7 @@ <h6 id="date" class="text-muted">Updated {{ answer.created|date:"n/d/y" }}</h6>
                                                                     <span class="downvoteCount">{{ answer.count_votes.downvotes }}</span>
                                                                 </div>
                                                             </div>
-                                                            {% if answer.user == user %}
+                                                            {% if answer.user == user and not answer.is_deleted %}
                                                                 <div class="answer-actions d-inline-flex">
                                                                     <a data-toggle="modal" type="button" class="answer-edit h5 px-2 text-tcf-blue" data-target="#edit-answer-modal{{answer.id}}" id="edit-answer-button{{answer_id}}">
                                                                         <i class="fas fa-pencil-alt"></i>
@@ -327,10 +339,6 @@ <h5 class="modal-title">Answer a Question</h5>
                 </div>
                 <div class="modal-body">
                     <div class="col mb-3">
-                        <div class="alert alert-danger" id="duplicate-answer" style="display:none">
-                            <p id="duplicate-answer">It looks like you've already submitted a answer for this question!
-                                If you'd like, you may edit your original response.</p>
-                        </div>
                         <form method="POST" action="{% url 'new_answer' %}" id="answerForm">
                             {% csrf_token %}
                             <fieldset>
@@ -397,4 +405,4 @@ <h5 class="modal-title">Answer a Question</h5>
         $(this).removeAttr('href');
     });
     {% endif %}
-</script>
\ No newline at end of file
+</script>
diff --git a/tcf_website/templates/qa/qa_dashboard.html b/tcf_website/templates/qa/qa_dashboard.html
new file mode 100644
index 000000000..203d981a1
--- /dev/null
+++ b/tcf_website/templates/qa/qa_dashboard.html
@@ -0,0 +1,339 @@
+{% extends "base/base.html" %}
+{% load static %}
+
+{% block title %}Q&A | theCourseForum{% endblock %}
+
+{% block styles %}
+    <link rel="stylesheet" href="{% static 'qa/qa_dashboard.css' %}">
+{% endblock %}
+
+{% block content %}
+<div class="qa-container">
+    <!-- Left Sidebar: Posts List -->
+    <div class="qa-sidebar">
+        <!-- Header with New Post button and Search -->
+        <div class="qa-header">
+            {% if user.is_authenticated %}
+            <button class="btn-new-post" id="openNewPostModal">
+                <i class="fa fa-plus"></i> New Post
+            </button>
+            {% else %}
+            <a href="{% url 'login' %}" class="btn-new-post">
+                <i class="fa fa-sign-in"></i> Login to Post
+            </a>
+            {% endif %}
+            <div class="search-container">
+                <i class="fa fa-search search-icon"></i>
+                <input type="text"
+                       class="search-input"
+                       id="searchInput"
+                       placeholder="Search questions..."
+                       value="{{ search_query }}">
+            </div>
+        </div>
+
+        <!-- Course Filter -->
+        <div class="qa-filters">
+            <div class="filter-row">
+                <!-- Department Dropdown -->
+                <div class="dropdown" id="departmentDropdownContainer">
+                    <button class="filter-btn dropdown-toggle {% if selected_department %}filter-active{% endif %}" type="button" id="departmentDropdown" data-toggle="dropdown">
+                        <i class="fa fa-list"></i>
+                        <span id="departmentLabel">
+                            {% if selected_department %}
+                                {% for dept in departments_list %}
+                                    {% if dept.id == selected_department %}
+                                        {{ dept.name }}
+                                    {% endif %}
+                                {% endfor %}
+                            {% else %}
+                                All Departments
+                            {% endif %}
+                        </span>
+                    </button>
+                    <div class="dropdown-menu" aria-labelledby="departmentDropdown">
+                        <div class="dropdown-search-wrapper">
+                            <input type="text"
+                                   class="dropdown-search-input"
+                                   id="departmentFilterSearch"
+                                   placeholder="Search departments..."
+                                   autocomplete="off">
+                        </div>
+                        <div class="dropdown-items-list" id="departmentFilterList">
+                            <a class="dropdown-item {% if not selected_department %}active{% endif %}"
+                               data-department-id=""
+                               href="{% url 'qa' %}{% if search_query %}?q={{ search_query }}{% endif %}">
+                                All Departments
+                            </a>
+                            {% for dept in departments_list %}
+                            <a class="dropdown-item {% if selected_department == dept.id %}active{% endif %}"
+                               data-department-id="{{ dept.id }}"
+                               href="#">
+                                {{ dept.name }}
+                            </a>
+                            {% endfor %}
+                        </div>
+                    </div>
+                </div>
+
+                <!-- Course Dropdown (shows when department is selected) -->
+                <div class="dropdown" id="courseDropdownContainer" style="display: none;">
+                    <button class="filter-btn dropdown-toggle {% if selected_course %}filter-active{% endif %}" type="button" id="courseDropdown" data-toggle="dropdown">
+                        <i class="fa fa-list"></i>
+                        <span id="courseLabel">
+                            {% if selected_course_obj %}
+                                {{ selected_course_obj.subdepartment.mnemonic }} {{ selected_course_obj.number }}
+                            {% elif selected_scope == 'department_broad' %}
+                                Department
+                            {% else %}
+                                All Posts
+                            {% endif %}
+                        </span>
+                    </button>
+                    <div class="dropdown-menu" aria-labelledby="courseDropdown">
+                        <div class="dropdown-search-wrapper">
+                            <input type="text"
+                                   class="dropdown-search-input"
+                                   id="courseFilterSearch"
+                                   placeholder="Search courses..."
+                                   autocomplete="off">
+                        </div>
+                        <div class="dropdown-items-list" id="courseFilterList">
+                            <a class="dropdown-item {% if not selected_course and selected_scope != 'department_broad' %}active{% endif %}"
+                               data-course-id=""
+                               data-scope=""
+                               href="{% url 'qa' %}{% if search_query %}?q={{ search_query }}{% endif %}">
+                                All Posts
+                            </a>
+                            <a class="dropdown-item {% if selected_scope == 'department_broad' %}active{% endif %}"
+                               data-course-id=""
+                               data-scope="department_broad"
+                               href="#">
+                                Department
+                            </a>
+                            {% for course in courses_with_questions %}
+                            <a class="dropdown-item {% if selected_course == course.id|stringformat:'s' %}active{% endif %}"
+                               data-course-id="{{ course.id }}"
+                               data-scope=""
+                               data-department-id="{{ course.subdepartment.department.id }}"
+                               href="{% url 'qa' %}?course={{ course.id }}{% if search_query %}&q={{ search_query }}{% endif %}">
+                                {{ course.subdepartment.mnemonic }} {{ course.number }}
+                            </a>
+                            {% endfor %}
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <!-- Posts List -->
+        <div class="posts-list" id="postsList">
+            {% include 'qa/_question_list.html' %}
+        </div>
+    </div>
+
+    <!-- Right Content: Question Detail -->
+    <div class="qa-content" id="questionContent">
+        {% include 'qa/_question_content.html' %}
+    </div>
+</div>
+
+<!-- New Post Modal -->
+<div id="newPostModal" class="modal-overlay" style="display: none;">
+    <div class="modal-container">
+        <div class="modal-header">
+            <h2>Ask a Question</h2>
+            <button class="modal-close" id="closeModal">
+                <i class="fa fa-times"></i>
+            </button>
+        </div>
+        <form id="newPostForm" method="POST" action="{% url 'create_question' %}">
+            {% csrf_token %}
+            <div class="modal-body">
+                <div class="form-group">
+                    <label for="postTitle">Title <span class="required">*</span></label>
+                    <input type="text"
+                           id="postTitle"
+                           name="title"
+                           class="form-control"
+                           placeholder="e.g. How hard is the final exam?"
+                           required
+                           maxlength="200">
+                </div>
+                <div class="form-group">
+                    <label for="courseSearch">Course or Department <span class="required">*</span></label>
+                    <input type="text"
+                           id="courseSearch"
+                           class="form-control"
+                           placeholder="Search for a course or department..."
+                           autocomplete="off">
+                    <input type="hidden" id="courseId" name="course">
+                    <input type="hidden" id="departmentId" name="department">
+                    <div id="courseResults" class="course-search-results"></div>
+                </div>
+                <div class="form-group">
+                    <label for="instructorSearch">Instructor</label>
+                    <input type="text"
+                           id="instructorSearch"
+                           class="form-control"
+                           placeholder="Select a course first..."
+                           autocomplete="off"
+                           disabled>
+                    <input type="hidden" id="instructorId" name="instructor">
+                    <div id="instructorResults" class="course-search-results"></div>
+                </div>
+                <div class="form-group">
+                    <label for="postText">Question <span class="required">*</span></label>
+                    <textarea id="postText"
+                              name="text"
+                              class="form-control"
+                              placeholder="Describe your question in detail..."
+                              required
+                              rows="4"></textarea>
+                </div>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn-cancel" id="cancelModal">Cancel</button>
+                <button type="submit" class="btn-submit">Post Question</button>
+            </div>
+        </form>
+    </div>
+</div>
+
+<!-- Edit Question Modal -->
+<div id="editQuestionModal" class="modal-overlay" style="display: none;">
+    <div class="modal-container">
+        <div class="modal-header">
+            <h2>Edit Question</h2>
+            <button class="modal-close" id="closeEditModal">
+                <i class="fa fa-times"></i>
+            </button>
+        </div>
+        <form id="editQuestionForm" method="POST">
+            {% csrf_token %}
+            <div class="modal-body">
+                <div class="form-group">
+                    <label for="editTitle">Title</label>
+                    <input type="text" id="editTitle" name="title" class="form-control" maxlength="200">
+                </div>
+                <div class="form-group">
+                    <label for="editText">Question</label>
+                    <textarea id="editText" name="text" class="form-control" rows="4" required></textarea>
+                </div>
+                <!-- Keep target metadata stable when editing title/body only. -->
+                <input type="hidden" id="editCourse" name="course">
+                <input type="hidden" id="editDepartment" name="department">
+                <input type="hidden" id="editInstructor" name="instructor">
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn-cancel" id="cancelEditModal">Cancel</button>
+                <button type="submit" class="btn-submit">Save Changes</button>
+            </div>
+        </form>
+    </div>
+</div>
+
+<!-- Edit Answer Modal -->
+<div id="editAnswerModal" class="modal-overlay" style="display: none;">
+    <div class="modal-container">
+        <div class="modal-header">
+            <h2>Edit Answer</h2>
+            <button class="modal-close" id="closeEditAnswerModal">
+                <i class="fa fa-times"></i>
+            </button>
+        </div>
+        <form id="editAnswerForm" method="POST">
+            {% csrf_token %}
+            <div class="modal-body">
+                <div class="form-group">
+                    <label for="editAnswerSemester">Semester</label>
+                    <select id="editAnswerSemester" name="semester" class="form-control">
+                        <option value="">Not Taken</option>
+                        {% for semester in semesters %}
+                        <option value="{{ semester.id }}">{{ semester }}</option>
+                        {% endfor %}
+                    </select>
+                </div>
+                <div class="form-group">
+                    <label for="editAnswerText">Answer</label>
+                    <textarea id="editAnswerText" name="text" class="form-control" rows="4" required></textarea>
+                </div>
+                <input type="hidden" id="editAnswerQuestion" name="question">
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn-cancel" id="cancelEditAnswerModal">Cancel</button>
+                <button type="submit" class="btn-submit">Save Changes</button>
+            </div>
+        </form>
+    </div>
+</div>
+
+<!-- Delete Question Confirmation Modal -->
+<div class="modal fade" id="deleteQuestionModal" tabindex="-1" role="dialog" aria-labelledby="deleteModalLabel" aria-hidden="true">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title">Delete Question</h5>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close" id="closeDeleteQuestionModal">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+            </div>
+            <div class="modal-body">
+                Are you sure you want to delete this question?
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-secondary" data-dismiss="modal" id="cancelDeleteQuestionModal">No</button>
+                <button type="button" class="btn btn-danger" id="confirmDeleteQuestion">Yes</button>
+            </div>
+        </div>
+    </div>
+</div>
+
+<!-- Delete Answer Confirmation Modal -->
+<div class="modal fade" id="deleteAnswerModal" tabindex="-1" role="dialog" aria-labelledby="deleteAnswerModalLabel" aria-hidden="true">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title">Delete Answer</h5>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close" id="closeDeleteAnswerModal">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+            </div>
+            <div class="modal-body">
+                Are you sure you want to delete this answer?
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-secondary" data-dismiss="modal" id="cancelDeleteAnswerModal">No</button>
+                <button type="button" class="btn btn-danger" id="confirmDeleteAnswer">Yes</button>
+            </div>
+        </div>
+    </div>
+</div>
+
+{% endblock %}
+
+{% block js %}
+<script>
+    const QA_URLS = {
+        questionDetail: '{% url "qa_question_detail" question_id=0 %}'.replace('/0/', '/__ID__/'),
+        createQuestion: '{% url "create_question" %}',
+        searchCourses: '{% url "qa_search_courses" %}',
+        getInstructors: '{% url "qa_get_instructors" course_id=0 %}'.replace('/0/instructors/', '/__ID__/instructors/'),
+        editQuestion: '{% url "edit_question" question_id=0 %}'.replace('/0/edit/', '/__ID__/edit/'),
+        editAnswer: '{% url "edit_answer" answer_id=0 %}'.replace('/0/edit/', '/__ID__/edit/'),
+        deleteQuestion: '{% url "delete_question" pk=0 %}'.replace('/0/delete/', '/__ID__/delete/'),
+        deleteAnswer: '{% url "delete_answer" pk=0 %}'.replace('/0/delete/', '/__ID__/delete/'),
+        upvoteQuestion: '{% url "qa_upvote_question" question_id=0 %}'.replace('/0/upvote/', '/__ID__/upvote/'),
+        upvoteAnswer: '{% url "qa_upvote_answer" answer_id=0 %}'.replace('/0/upvote/', '/__ID__/upvote/'),
+        dashboard: '{% url "qa" %}',
+    };
+    const IS_AUTHENTICATED = {{ user.is_authenticated|yesno:"true,false" }};
+    const CSRF_TOKEN = '{{ csrf_token }}';
+    const SEMESTERS = [
+        {% for semester in semesters %}
+        {"id": {{ semester.id }}, "label": "{{ semester|escapejs }}"}{% if not forloop.last %},{% endif %}
+        {% endfor %}
+    ];
+</script>
+<script src="{% static 'qa/qa_dashboard.js' %}"></script>
+{% endblock %}
diff --git a/tcf_website/tests/test_qa.py b/tcf_website/tests/test_qa.py
new file mode 100644
index 000000000..f48e96033
--- /dev/null
+++ b/tcf_website/tests/test_qa.py
@@ -0,0 +1,515 @@
+# tcf_website/tests/test_qa.py
+"""Tests for the Q&A views."""
+
+from django.test import TestCase
+from django.urls import reverse
+
+from ..models import Answer, Question
+from .test_utils import setup, suppress_request_warnings
+
+
+class CreateQuestionTests(TestCase):
+    """Tests for the create_question view."""
+
+    def setUp(self):
+        setup(self)
+
+    def test_create_question_requires_login(self):
+        """Unauthenticated POST is redirected to login."""
+        response = self.client.post(
+            reverse("create_question"),
+            {
+                "title": "Test?",
+                "text": "Body",
+                "course": self.course.id,
+                "instructor": self.instructor.id,
+            },
+        )
+        self.assertEqual(response.status_code, 302)
+        self.assertIn("/login", response["Location"])
+
+    def test_create_question_creates_record(self):
+        """Valid POST creates a Question with correct fields."""
+        self.client.force_login(self.user1)
+        response = self.client.post(
+            reverse("create_question"),
+            {
+                "title": "What is the workload?",
+                "text": "How many hours per week?",
+                "course": self.course.id,
+                "instructor": self.instructor.id,
+            },
+        )
+        self.assertRedirects(response, reverse("qa"), fetch_redirect_response=False)
+        q = Question.objects.get(user=self.user1)
+        self.assertEqual(q.title, "What is the workload?")
+        self.assertEqual(q.text, "How many hours per week?")
+        self.assertEqual(q.instructor, self.instructor)
+
+    def test_create_question_redirects_to_qa(self):
+        """Valid POST redirects to /qa/."""
+        self.client.force_login(self.user1)
+        response = self.client.post(
+            reverse("create_question"),
+            {
+                "title": "Test title",
+                "text": "Test body text here",
+                "course": self.course.id,
+                "instructor": self.instructor.id,
+            },
+        )
+        self.assertRedirects(response, reverse("qa"), fetch_redirect_response=False)
+
+    def test_create_department_question_without_instructor(self):
+        """Valid POST can create a department-targeted question without instructor."""
+        self.client.force_login(self.user1)
+        self.client.post(
+            reverse("create_question"),
+            {
+                "title": "Department elective advice",
+                "text": "What are good upper-level electives?",
+                "department": self.department.id,
+            },
+        )
+        q = Question.objects.get(user=self.user1, title="Department elective advice")
+        self.assertEqual(q.department, self.department)
+        self.assertIsNone(q.course)
+        self.assertIsNone(q.instructor)
+
+    def test_department_question_ignores_stale_course_and_instructor(self):
+        """Department selection should win if stale course/instructor IDs are also posted."""
+        self.client.force_login(self.user1)
+        self.client.post(
+            reverse("create_question"),
+            {
+                "title": "Department-only target",
+                "text": "This should not save to a course.",
+                "department": self.department.id,
+                "course": self.course.id,
+                "instructor": self.instructor.id,
+            },
+        )
+
+        q = Question.objects.get(user=self.user1, title="Department-only target")
+        self.assertEqual(q.department, self.department)
+        self.assertIsNone(q.course)
+        self.assertIsNone(q.instructor)
+
+
+class QaDashboardTests(TestCase):
+    """Tests for the qa_dashboard view."""
+
+    def setUp(self):
+        setup(self)
+        self.question1 = Question.objects.create(
+            title="Workload?",
+            text="How hard is this course?",
+            course=self.course,
+            instructor=self.instructor,
+            user=self.user1,
+        )
+        self.question2 = Question.objects.create(
+            title="Exams?",
+            text="How many exams?",
+            course=self.course2,
+            instructor=self.instructor,
+            user=self.user2,
+        )
+        self.department_question = Question.objects.create(
+            title="Department recommendations",
+            text="Any broad CS recommendations?",
+            department=self.department,
+            user=self.user2,
+        )
+        self.client.force_login(self.user1)
+
+    def test_dashboard_returns_200(self):
+        """Dashboard page loads successfully."""
+        response = self.client.get(reverse("qa"))
+        self.assertEqual(response.status_code, 200)
+
+    def test_dashboard_contains_questions(self):
+        """Dashboard context includes all questions."""
+        response = self.client.get(reverse("qa"))
+        self.assertIn(self.question1, response.context["questions"])
+        self.assertIn(self.question2, response.context["questions"])
+
+    def test_dashboard_search_filter(self):
+        """?q= param filters questions by title/text."""
+        response = self.client.get(reverse("qa") + "?q=Workload")
+        self.assertIn(self.question1, response.context["questions"])
+        self.assertNotIn(self.question2, response.context["questions"])
+
+    def test_dashboard_course_filter(self):
+        """?course= param filters questions by course."""
+        response = self.client.get(reverse("qa") + f"?course={self.course.id}")
+        self.assertIn(self.question1, response.context["questions"])
+        self.assertNotIn(self.question2, response.context["questions"])
+        self.assertNotIn(self.department_question, response.context["questions"])
+
+    def test_dashboard_department_filter_includes_department_and_course_posts(self):
+        """?department= includes both department-broad and course-targeted questions."""
+        response = self.client.get(reverse("qa") + f"?department={self.department.id}")
+        self.assertIn(self.question1, response.context["questions"])
+        self.assertIn(self.question2, response.context["questions"])
+        self.assertIn(self.department_question, response.context["questions"])
+
+    def test_dashboard_department_broad_scope_filter(self):
+        """?scope=department_broad limits to department-targeted posts only."""
+        response = self.client.get(
+            reverse("qa")
+            + f"?department={self.department.id}&scope=department_broad"
+        )
+        self.assertIn(self.department_question, response.context["questions"])
+        self.assertNotIn(self.question1, response.context["questions"])
+        self.assertNotIn(self.question2, response.context["questions"])
+
+    def test_dashboard_selected_question(self):
+        """?question= param sets the active question in context."""
+        response = self.client.get(reverse("qa") + f"?question={self.question2.id}")
+        self.assertEqual(response.context["selected_question"].id, self.question2.id)
+
+    def test_dashboard_has_courses_in_context(self):
+        """Dashboard context includes courses list for filter dropdown."""
+        response = self.client.get(reverse("qa"))
+        self.assertIn("courses_with_questions", response.context)
+
+
+class QuestionDetailTests(TestCase):
+    """Tests for the question_detail AJAX view."""
+
+    def setUp(self):
+        setup(self)
+        self.question = Question.objects.create(
+            title="Best study tips?",
+            text="What study strategies work well?",
+            course=self.course,
+            instructor=self.instructor,
+            user=self.user1,
+        )
+        self.answer = Answer.objects.create(
+            text="Review lecture notes daily.",
+            question=self.question,
+            user=self.user2,
+            semester=self.semester,
+        )
+
+    def test_question_detail_accessible_without_login(self):
+        """Unauthenticated request returns 200 (read-only access)."""
+        response = self.client.get(
+            reverse("qa_question_detail", args=[self.question.id])
+        )
+        self.assertEqual(response.status_code, 200)
+
+    def test_question_detail_returns_200(self):
+        """Returns 200 for a valid question ID."""
+        self.client.force_login(self.user1)
+        response = self.client.get(
+            reverse("qa_question_detail", args=[self.question.id])
+        )
+        self.assertEqual(response.status_code, 200)
+
+    def test_question_detail_contains_question_text(self):
+        """Response HTML contains the question text."""
+        self.client.force_login(self.user1)
+        response = self.client.get(
+            reverse("qa_question_detail", args=[self.question.id])
+        )
+        self.assertContains(response, "What study strategies work well?")
+
+    def test_question_detail_contains_answer(self):
+        """Response HTML contains the answer text."""
+        self.client.force_login(self.user1)
+        response = self.client.get(
+            reverse("qa_question_detail", args=[self.question.id])
+        )
+        self.assertContains(response, "Review lecture notes daily.")
+
+    def test_question_detail_labels_answer_without_semester(self):
+        """Answers without a semester render as not taken yet."""
+        Answer.objects.create(
+            text="I am planning to take it next term.",
+            question=self.question,
+            user=self.user1,
+            semester=None,
+        )
+
+        response = self.client.get(
+            reverse("qa_question_detail", args=[self.question.id])
+        )
+
+        self.assertContains(response, "Not Taken")
+
+    def test_new_answer_accepts_blank_semester(self):
+        """Blank semester stores a null semester on the answer."""
+        self.client.force_login(self.user1)
+
+        response = self.client.post(
+            reverse("new_answer"),
+            {
+                "text": "I have not taken it yet.",
+                "question": self.question.id,
+                "semester": "",
+            },
+        )
+
+        self.assertEqual(response.status_code, 302)
+        answer = Answer.objects.get(text="I have not taken it yet.")
+        self.assertIsNone(answer.semester)
+
+    def test_user_can_create_multiple_answers_for_same_question(self):
+        """A user may post more than one top-level answer to one question."""
+        self.client.force_login(self.user1)
+
+        first_response = self.client.post(
+            reverse("new_answer"),
+            {
+                "text": "First answer.",
+                "question": self.question.id,
+                "semester": self.semester.id,
+            },
+        )
+        second_response = self.client.post(
+            reverse("new_answer"),
+            {
+                "text": "Second answer.",
+                "question": self.question.id,
+                "semester": self.semester.id,
+            },
+        )
+
+        self.assertEqual(first_response.status_code, 302)
+        self.assertEqual(second_response.status_code, 302)
+        self.assertEqual(
+            Answer.objects.filter(question=self.question, user=self.user1).count(),
+            2,
+        )
+
+    def test_new_reply_accepts_blank_semester(self):
+        """Blank semester stores a null semester on a reply."""
+        self.client.force_login(self.user1)
+
+        response = self.client.post(
+            reverse("new_reply"),
+            {
+                "text": "Following because I have not taken it either.",
+                "question": self.question.id,
+                "parent_answer": self.answer.id,
+                "semester": "",
+            },
+        )
+
+        self.assertEqual(response.status_code, 302)
+        reply = Answer.objects.get(text="Following because I have not taken it either.")
+        self.assertIsNone(reply.semester)
+        self.assertEqual(reply.parent_answer, self.answer)
+
+    def test_question_detail_renders_nested_replies_with_capped_indent(self):
+        """Nested replies render recursively and stop increasing indent after level 3."""
+        reply_1 = Answer.objects.create(
+            text="First reply",
+            question=self.question,
+            user=self.user1,
+            semester=self.semester,
+            parent_answer=self.answer,
+        )
+        reply_2 = Answer.objects.create(
+            text="Second reply",
+            question=self.question,
+            user=self.user2,
+            semester=self.semester,
+            parent_answer=reply_1,
+        )
+        reply_3 = Answer.objects.create(
+            text="Third reply",
+            question=self.question,
+            user=self.user1,
+            semester=self.semester,
+            parent_answer=reply_2,
+        )
+        Answer.objects.create(
+            text="Fourth reply",
+            question=self.question,
+            user=self.user2,
+            semester=self.semester,
+            parent_answer=reply_3,
+        )
+
+        self.client.force_login(self.user1)
+        response = self.client.get(
+            reverse("qa_question_detail", args=[self.question.id])
+        )
+
+        self.assertContains(response, "First reply")
+        self.assertContains(response, "Second reply")
+        self.assertContains(response, "Third reply")
+        self.assertContains(response, "Fourth reply")
+        self.assertContains(response, 'class="response-count">(5)</span>', html=True)
+        self.assertContains(response, 'data-depth="4"', html=False)
+        self.assertContains(response, "thread-depth-3")
+        self.assertNotContains(response, "thread-depth-4")
+
+    def test_delete_answer_soft_deletes_and_keeps_replies(self):
+        """Deleting an answer leaves a placeholder and preserves nested replies."""
+        reply = Answer.objects.create(
+            text="Nested reply stays.",
+            question=self.question,
+            user=self.user1,
+            semester=self.semester,
+            parent_answer=self.answer,
+        )
+        self.client.force_login(self.user2)
+
+        response = self.client.post(reverse("delete_answer", args=[self.answer.id]))
+
+        self.assertRedirects(response, reverse("qa"), fetch_redirect_response=False)
+        self.answer.refresh_from_db()
+        self.assertEqual(self.answer.text, "")
+        self.assertTrue(Answer.objects.filter(pk=reply.pk).exists())
+
+        detail_response = self.client.get(
+            reverse("qa_question_detail", args=[self.question.id])
+        )
+        self.assertContains(detail_response, "[deleted]")
+        self.assertContains(detail_response, "Nested reply stays.")
+
+    def test_delete_question_soft_deletes_and_keeps_answers(self):
+        """Deleting a question leaves a placeholder and preserves answers."""
+        self.client.force_login(self.user1)
+
+        response = self.client.post(reverse("delete_question", args=[self.question.id]))
+
+        self.assertRedirects(response, reverse("qa"), fetch_redirect_response=False)
+        self.question.refresh_from_db()
+        self.assertEqual(self.question.title, "")
+        self.assertEqual(self.question.text, "")
+        self.assertTrue(Answer.objects.filter(pk=self.answer.pk).exists())
+
+        detail_response = self.client.get(
+            reverse("qa_question_detail", args=[self.question.id])
+        )
+        self.assertContains(detail_response, "[deleted]")
+        self.assertContains(detail_response, "Review lecture notes daily.")
+
+    def test_dashboard_still_lists_soft_deleted_questions(self):
+        """Soft-deleted questions remain selectable so their answers stay reachable."""
+        self.question.soft_delete()
+        self.client.force_login(self.user1)
+
+        response = self.client.get(reverse("qa") + f"?question={self.question.id}")
+
+        self.assertEqual(response.status_code, 200)
+        self.assertIn(self.question, response.context["questions"])
+        self.assertEqual(response.context["selected_question"].id, self.question.id)
+        self.assertContains(response, "[deleted]")
+
+    @suppress_request_warnings
+    def test_question_detail_404_for_nonexistent(self):
+        """Returns 404 for a nonexistent question ID."""
+        self.client.force_login(self.user1)
+        response = self.client.get(reverse("qa_question_detail", args=[99999]))
+        self.assertEqual(response.status_code, 404)
+
+
+class SearchCoursesQaTests(TestCase):
+    """Tests for search_courses_qa API."""
+
+    def setUp(self):
+        setup(self)
+
+    def test_short_query_returns_empty(self):
+        """Short (1-char) query returns empty results per min-length guard."""
+        self.client.force_login(self.user1)
+        response = self.client.get(reverse("qa_search_courses") + "?q=a")
+        self.assertEqual(response.status_code, 200)
+        data = response.json()
+        self.assertEqual(data["results"], [])
+
+    def test_course_search_returns_json(self):
+        """Course search endpoint returns JSON with results key."""
+        self.client.force_login(self.user1)
+        response = self.client.get(reverse("qa_search_courses") + "?q=CS")
+        self.assertEqual(response.status_code, 200)
+        data = response.json()
+        self.assertIn("results", data)
+        self.assertIsInstance(data["results"], list)
+
+    def test_search_returns_department_results(self):
+        """Search endpoint includes department matches in the same result set."""
+        self.client.force_login(self.user1)
+        response = self.client.get(reverse("qa_search_courses") + "?q=Computer")
+        self.assertEqual(response.status_code, 200)
+        data = response.json()
+        self.assertTrue(
+            any(item.get("type") == "department" for item in data["results"])
+        )
+
+
+class GetInstructorsForCourseTests(TestCase):
+    """Tests for get_instructors_for_course API."""
+
+    def setUp(self):
+        setup(self)
+
+    def test_returns_instructors_for_course(self):
+        """Returns instructors who have taught the course."""
+        self.client.force_login(self.user1)
+        response = self.client.get(reverse("qa_get_instructors", args=[self.course.id]))
+        self.assertEqual(response.status_code, 200)
+        data = response.json()
+        self.assertIn("instructors", data)
+        instructor_ids = [i["id"] for i in data["instructors"]]
+        self.assertIn(self.instructor.id, instructor_ids)
+
+    @suppress_request_warnings
+    def test_returns_404_for_invalid_course(self):
+        """Returns 404 for a nonexistent course ID."""
+        self.client.force_login(self.user1)
+        response = self.client.get(reverse("qa_get_instructors", args=[99999]))
+        self.assertEqual(response.status_code, 404)
+
+
+class QaDashboardIntegrationTest(TestCase):
+    """End-to-end smoke test for the Q&A dashboard flow."""
+
+    def setUp(self):
+        setup(self)
+
+    def test_full_qa_flow(self):
+        """User creates a question, another user answers it."""
+        self.client.force_login(self.user1)
+
+        # Create question
+        response = self.client.post(
+            reverse("create_question"),
+            {
+                "title": "How is the grading?",
+                "text": "Is it curve-based?",
+                "course": self.course.id,
+                "instructor": self.instructor.id,
+            },
+        )
+        self.assertRedirects(response, reverse("qa"), fetch_redirect_response=False)
+
+        question = Question.objects.get(title="How is the grading?")
+
+        # Load question detail AJAX
+        self.client.force_login(self.user2)
+        response = self.client.get(reverse("qa_question_detail", args=[question.id]))
+        self.assertEqual(response.status_code, 200)
+        self.assertContains(response, "Is it curve-based?")
+
+        # Post answer
+        response = self.client.post(
+            reverse("new_answer"),
+            {
+                "text": "Yes, there is a generous curve.",
+                "question": question.id,
+                "semester": self.semester.id,
+            },
+        )
+        self.assertEqual(response.status_code, 302)
+
+        # Verify answer appears in detail
+        response = self.client.get(reverse("qa_question_detail", args=[question.id]))
+        self.assertContains(response, "Yes, there is a generous curve.")
diff --git a/tcf_website/urls.py b/tcf_website/urls.py
index 7ed8ee62c..881191b0d 100644
--- a/tcf_website/urls.py
+++ b/tcf_website/urls.py
@@ -97,10 +97,31 @@
     ),
     path("schedule/add_course/", views.schedule_add_course, name="schedule_add_course"),
     # QA URLs
-    path("answers/check_duplicate/", views.qa.check_duplicate),
+    path("qa/", views.qa_dashboard, name="qa"),
+    path("qa/create/", views.qa.create_question, name="create_question"),
+    path(
+        "qa/question/<int:question_id>/",
+        views.question_detail,
+        name="qa_question_detail",
+    ),
+    path(
+        "qa/api/courses/search/",
+        views.search_courses_qa,
+        name="qa_search_courses",
+    ),
+    path(
+        "qa/api/courses/<int:course_id>/instructors/",
+        views.get_instructors_for_course,
+        name="qa_get_instructors",
+    ),
     path("qa/new_question/", views.new_question, name="new_question"),
     path("qa/new_answer/", views.new_answer, name="new_answer"),
-    path("questions/<int:question_id>/upvote/", views.upvote_question),
+    path("qa/new_reply/", views.qa.new_reply, name="new_reply"),
+    path(
+        "questions/<int:question_id>/upvote/",
+        views.upvote_question,
+        name="qa_upvote_question",
+    ),
     path("questions/<int:question_id>/downvote/", views.downvote_question),
     path(
         "questions/<int:pk>/delete/",
@@ -112,7 +133,11 @@
         views.edit_question,
         name="edit_question",
     ),
-    path("answers/<int:answer_id>/upvote/", views.upvote_answer),
+    path(
+        "answers/<int:answer_id>/upvote/",
+        views.upvote_answer,
+        name="qa_upvote_answer",
+    ),
     path("answers/<int:answer_id>/downvote/", views.downvote_answer),
     path(
         "answers/<int:pk>/delete/",
diff --git a/tcf_website/views/__init__.py b/tcf_website/views/__init__.py
index c7178f843..056666130 100644
--- a/tcf_website/views/__init__.py
+++ b/tcf_website/views/__init__.py
@@ -6,24 +6,29 @@
 from .auth import login, logout
 from .browse import (
     browse,
+    club_category,
     course_instructor,
     course_view,
     course_view_legacy,
     department,
     instructor_view,
-    club_category,
 )
 from .index import AboutView, index, privacy, terms
 from .profile import DeleteProfile, profile, reviews
 from .qa import (
     DeleteAnswer,
     DeleteQuestion,
+    create_question,
     downvote_answer,
     downvote_question,
     edit_answer,
     edit_question,
+    get_instructors_for_course,
     new_answer,
     new_question,
+    qa_dashboard,
+    question_detail,
+    search_courses_qa,
     upvote_answer,
     upvote_question,
 )
diff --git a/tcf_website/views/qa.py b/tcf_website/views/qa.py
index a14f88d1b..3f429c7f9 100644
--- a/tcf_website/views/qa.py
+++ b/tcf_website/views/qa.py
@@ -1,42 +1,359 @@
 """View for question and answer creation."""
 
-import datetime
+import logging
 
 from django import forms
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required
 from django.contrib.auth.mixins import LoginRequiredMixin  # For class-based views
-from django.contrib.messages.views import SuccessMessageMixin
+from django.contrib.postgres.search import TrigramSimilarity
 from django.core.exceptions import PermissionDenied
+from django.db import models
+from django.db.models import Q
 from django.http import HttpResponseRedirect, JsonResponse
-from django.shortcuts import get_object_or_404, redirect
+from django.shortcuts import get_object_or_404, redirect, render
+from django.template.loader import render_to_string
 from django.urls import reverse_lazy
+from django.utils import timezone
 from django.views import generic
 
-from ..models import Answer, Question
+from ..models import Answer, Course, Department, Instructor, Question, Semester
+
+logger = logging.getLogger(__name__)
+
+
+def qa_dashboard(request):
+    """Q&A Dashboard view."""
+    search_query = request.GET.get("q", "").strip()
+    department_filter = request.GET.get("department", "").strip()
+    course_filter = request.GET.get("course", "")
+    scope_filter = request.GET.get("scope", "").strip()
+    selected_question_id = request.GET.get("question", None)
+    try:
+        selected_question_id = (
+            int(selected_question_id) if selected_question_id else None
+        )
+    except (TypeError, ValueError):
+        selected_question_id = None
+
+    # Base queryset annotated with vote totals
+    questions = (
+        Question.objects.select_related(
+            "course",
+            "course__subdepartment",
+            "course__subdepartment__department",
+            "department",
+            "instructor",
+            "user",
+        )
+        .annotate(
+            sum_q_votes=models.functions.Coalesce(
+                models.Sum("votequestion__value"), models.Value(0)
+            )
+        )
+    )
+
+    if request.user.is_authenticated:
+        questions = questions.annotate(
+            user_q_vote=models.functions.Coalesce(
+                models.Sum(
+                    "votequestion__value",
+                    filter=models.Q(votequestion__user=request.user),
+                ),
+                models.Value(0),
+            )
+        )
+
+    if search_query:
+        questions = questions.filter(
+            Q(title__icontains=search_query)
+            | Q(text__icontains=search_query)
+            | Q(department__name__icontains=search_query)
+            | Q(course__subdepartment__mnemonic__icontains=search_query)
+            | Q(course__number__icontains=search_query)
+        )
+
+    if department_filter:
+        questions = questions.filter(
+            Q(department_id=department_filter)
+            | Q(course__subdepartment__department_id=department_filter)
+        )
+
+    if course_filter:
+        questions = questions.filter(course_id=course_filter)
+    elif department_filter and scope_filter == "department_broad":
+        questions = questions.filter(
+            department_id=department_filter, course__isnull=True
+        )
+
+    questions = questions.order_by("-created")
+
+    # Determine selected question
+    selected_question = None
+    answers = []
+    answer_count = 0
+    invalid_selected_question = False
+    if selected_question_id:
+        try:
+            selected_question = questions.get(id=selected_question_id)
+        except Question.DoesNotExist:
+            invalid_selected_question = True
+            logger.warning(
+                "Requested qa question %s was not found in filtered queryset.",
+                selected_question_id,
+            )
+    if selected_question is None:
+        selected_question = questions.first()
+
+    if selected_question:
+        answers = Answer.display_activity(
+            question_id=selected_question.id,
+            user=request.user,
+        )
+        answer_count = (
+            Answer.objects.filter(question=selected_question).exclude(text="").count()
+        )
+
+    # Courses that have at least one course-targeted question (for filter dropdown)
+    courses_with_questions = (
+        Course.objects.filter(question__isnull=False)
+        .select_related("subdepartment", "subdepartment__department")
+        .distinct()
+        .order_by(
+            "subdepartment__department__name",
+            "subdepartment__mnemonic",
+            "number",
+        )
+    )
+
+    # Departments represented in either course-targeted or department-targeted questions.
+    departments_list = list(
+        Department.objects.filter(
+            Q(question__isnull=False) | Q(subdepartment__course__question__isnull=False)
+        )
+        .distinct()
+        .order_by("name")
+        .values("id", "name")
+    )
+
+    selected_course_obj = None
+    selected_department = None
+    selected_scope = "department_broad" if scope_filter == "department_broad" else ""
+    if course_filter:
+        selected_course_obj = courses_with_questions.filter(pk=course_filter).first()
+        if selected_course_obj:
+            selected_department = selected_course_obj.subdepartment.department.id
+    elif department_filter:
+        try:
+            selected_department = int(department_filter)
+        except (TypeError, ValueError):
+            selected_department = None
+
+    semesters = Semester.objects.order_by("-number")[:20]
+
+    context = {
+        "questions": questions,
+        "selected_question": selected_question,
+        "answers": answers,
+        "courses_with_questions": courses_with_questions,
+        "departments_list": departments_list,
+        "search_query": search_query,
+        "selected_course": course_filter,
+        "selected_course_obj": selected_course_obj,
+        "selected_department": selected_department,
+        "selected_scope": selected_scope,
+        "semesters": semesters,
+        "answer_count": answer_count,
+        "invalid_selected_question": invalid_selected_question,
+    }
+
+    if request.headers.get("X-Requested-With") == "XMLHttpRequest":
+        posts_html = render_to_string(
+            "qa/_question_list.html",
+            context,
+            request=request,
+        )
+        detail_html = render_to_string(
+            "qa/_question_content.html",
+            context,
+            request=request,
+        )
+        return JsonResponse(
+            {
+                "posts_html": posts_html,
+                "detail_html": detail_html,
+                "selected_question_id": (
+                    selected_question.id if selected_question else None
+                ),
+                "invalid_selected_question": invalid_selected_question,
+            }
+        )
+
+    return render(request, "qa/qa_dashboard.html", context)
+
+
+@login_required
+def create_question(request):
+    """Create a new question via the Q&A dashboard modal."""
+    if request.method == "POST":
+        form = QuestionForm(request.POST)
+        if form.is_valid():
+            instance = form.save(commit=False)
+            instance.user = request.user
+            instance.save()
+        else:
+            messages.error(request, form.errors)
+        return redirect("qa")
+    return redirect("qa")
+
+
+def question_detail(request, question_id):
+    """AJAX endpoint: returns rendered HTML partial for a question + its answers."""
+    qs = Question.objects.select_related(
+        "course",
+        "course__subdepartment",
+        "course__subdepartment__department",
+        "department",
+        "instructor",
+        "user",
+    ).annotate(
+        sum_q_votes=models.functions.Coalesce(
+            models.Sum("votequestion__value"), models.Value(0)
+        ),
+    )
+    if request.user.is_authenticated:
+        qs = qs.annotate(
+            user_q_vote=models.functions.Coalesce(
+                models.Sum(
+                    "votequestion__value",
+                    filter=models.Q(votequestion__user=request.user),
+                ),
+                models.Value(0),
+            ),
+        )
+    question = get_object_or_404(qs, pk=question_id)
+
+    answers = Answer.display_activity(question_id=question.id, user=request.user)
+    answer_count = Answer.objects.filter(question=question).exclude(text="").count()
+    semesters = Semester.objects.order_by("-number")[
+        :20
+    ]  # for the answer form in _question_detail.html
+
+    return render(
+        request,
+        "qa/_question_detail.html",
+        {
+            "question": question,
+            "answers": answers,
+            "answer_count": answer_count,
+            "semesters": semesters,
+        },
+    )
+
+
+def search_courses_qa(request):
+    """API: search courses and departments for the New Post modal."""
+    query = request.GET.get("q", "").strip()
+    if len(query) < 2:
+        return JsonResponse({"results": []})
+
+    cutoff_year = timezone.now().year - 3
+    recent_courses = Course.objects.filter(semester_last_taught__year__gte=cutoff_year)
+
+    # Check for exact match
+    courses = (
+        recent_courses.filter(combined_mnemonic_number__istartswith=query)
+        .select_related("subdepartment", "semester_last_taught")
+        .order_by("combined_mnemonic_number")[:10]
+    )
+
+    ## Falls back to TrigramSimilarity if exact match doesnt exist
+    if not courses.exists():
+        courses = (
+            recent_courses.annotate(
+                similarity=TrigramSimilarity("combined_mnemonic_number", query)
+            )
+            .filter(similarity__gte=0.3)
+            .select_related("subdepartment", "semester_last_taught")
+            .order_by("-similarity")[:10]
+        )
+
+    departments = Department.objects.filter(name__icontains=query).order_by("name")[:10]
+
+    results = [
+        {
+            "id": course.id,
+            "type": "course",
+            "code": f"{course.subdepartment.mnemonic} {course.number}",
+            "title": course.title,
+        }
+        for course in courses
+    ]
+    results.extend(
+        {
+            "id": department.id,
+            "type": "department",
+            "code": department.name,
+            "title": "Department",
+        }
+        for department in departments
+    )
+    return JsonResponse({"results": results})
+
+
+def get_instructors_for_course(request, course_id):
+    """API: get instructors who have taught a given course."""
+    course = get_object_or_404(Course, pk=course_id)
+    instructors = (
+        Instructor.objects.filter(section__course=course, hidden=False)
+        .distinct()
+        .order_by("last_name", "first_name")
+    )
+    return JsonResponse(
+        {
+            "instructors": [
+                {"id": i.id, "name": f"{i.first_name} {i.last_name}".strip()}
+                for i in instructors
+            ]
+        }
+    )
 
 
 class QuestionForm(forms.ModelForm):
     """Form for question creation"""
 
+    def clean(self):
+        cleaned_data = super().clean()
+        course = cleaned_data.get("course")
+        department = cleaned_data.get("department")
+        instructor = cleaned_data.get("instructor")
+
+        if not course and not department:
+            raise forms.ValidationError("Please select a course or a department.")
+
+        if department:
+            # Department target takes precedence and clears course/instructor noise.
+            cleaned_data["course"] = None
+            cleaned_data["instructor"] = None
+        elif instructor and not course:
+            raise forms.ValidationError(
+                "Instructor can only be selected for course questions."
+            )
+
+        return cleaned_data
+
     class Meta:
         model = Question
-        fields = ["text", "course", "instructor"]
+        fields = ["title", "text", "course", "department", "instructor"]
 
 
-class DeleteQuestion(LoginRequiredMixin, SuccessMessageMixin, generic.DeleteView):
+class DeleteQuestion(LoginRequiredMixin, generic.DeleteView):
     """Question deletion view."""
 
     model = Question
 
     def get_success_url(self):
-        return reverse_lazy(
-            "course_instructor",
-            kwargs={
-                "course_id": self.object.course_id,
-                "instructor_id": self.object.instructor_id,
-            },
-        )
+        return reverse_lazy("qa")
 
     def get_object(self):  # pylint: disable=arguments-differ
         """Override DeleteView's function to validate question belonging to user."""
@@ -46,14 +363,11 @@ def get_object(self):  # pylint: disable=arguments-differ
             raise PermissionDenied("You are not allowed to delete this question!")
         return obj
 
-    def get_success_message(self, cleaned_data) -> str:
-        """Overrides SuccessMessageMixin's get_success_message method."""
-        # get the course this review is about
-        course = self.object.course
-        instructor = self.object.instructor
-
-        # return success message
-        return f"Successfully deleted your question for {str(course)} and {str(instructor)}!"
+    def form_valid(self, form):
+        """Soft-delete questions so answers and replies remain visible."""
+        self.object = self.get_object()
+        self.object.soft_delete()
+        return HttpResponseRedirect(self.get_success_url())
 
 
 @login_required
@@ -69,9 +383,6 @@ def new_question(request):
 
             instance.save()
 
-            messages.success(
-                request, f"Successfully added a question for {instance.course}!"
-            )
             return HttpResponseRedirect(request.META.get("HTTP_REFERER", "/"))
         return HttpResponseRedirect(request.META.get("HTTP_REFERER", "/"))
     return HttpResponseRedirect(request.META.get("HTTP_REFERER", "/"))
@@ -83,16 +394,14 @@ def edit_question(request, question_id):
     question = get_object_or_404(Question, pk=question_id)
     if question.user != request.user:
         raise PermissionDenied("You are not allowed to edit this question!")
+    if question.is_deleted:
+        raise PermissionDenied("You cannot edit a deleted question!")
 
     if request.method == "POST":
         form = QuestionForm(request.POST, instance=question)
         if form.is_valid():
             form.save()
-            messages.success(
-                request,
-                f"Successfully updated your question for {form.instance.course}!",
-            )
-            question.created = datetime.datetime.now()
+            question.created = timezone.now()
             question.save()
             return HttpResponseRedirect(request.META.get("HTTP_REFERER", "/"))
         messages.error(request, form.errors)
@@ -103,21 +412,31 @@ def edit_question(request, question_id):
 
 @login_required
 def upvote_question(request, question_id):
-    """Upvote a view."""
+    """Upvote a question."""
     if request.method == "POST":
-        question = Question.objects.get(pk=question_id)
+        question = get_object_or_404(Question, pk=question_id)
         question.upvote(request.user)
-        return JsonResponse({"ok": True})
+        net = (
+            question.votequestion_set.aggregate(total=models.Sum("value"))["total"] or 0
+        )
+        vote_obj = question.votequestion_set.filter(user=request.user).first()
+        user_vote = vote_obj.value if vote_obj else 0
+        return JsonResponse({"ok": True, "votes": net, "user_vote": user_vote})
     return JsonResponse({"ok": False})
 
 
 @login_required
 def downvote_question(request, question_id):
-    """Downvote a view."""
+    """Downvote a question."""
     if request.method == "POST":
-        question = Question.objects.get(pk=question_id)
+        question = get_object_or_404(Question, pk=question_id)
         question.downvote(request.user)
-        return JsonResponse({"ok": True})
+        net = (
+            question.votequestion_set.aggregate(total=models.Sum("value"))["total"] or 0
+        )
+        vote_obj = question.votequestion_set.filter(user=request.user).first()
+        user_vote = vote_obj.value if vote_obj else 0
+        return JsonResponse({"ok": True, "votes": net, "user_vote": user_vote})
     return JsonResponse({"ok": False})
 
 
@@ -129,19 +448,38 @@ class Meta:
         fields = ["text", "semester", "question"]
 
 
-class DeleteAnswer(LoginRequiredMixin, SuccessMessageMixin, generic.DeleteView):
+class ReplyForm(forms.ModelForm):
+    """Form for reply creation (reply to an answer)"""
+
+    def clean(self):
+        cleaned_data = super().clean()
+        question = cleaned_data.get("question")
+        parent_answer = cleaned_data.get("parent_answer")
+
+        if (
+            question is not None
+            and parent_answer is not None
+            and parent_answer.question_id != question.id
+        ):
+            self.add_error(
+                "parent_answer",
+                "That reply target does not belong to the selected question.",
+            )
+
+        return cleaned_data
+
+    class Meta:
+        model = Answer
+        fields = ["text", "semester", "question", "parent_answer"]
+
+
+class DeleteAnswer(LoginRequiredMixin, generic.DeleteView):
     """Answer deletion view."""
 
     model = Answer
 
     def get_success_url(self):
-        return reverse_lazy(
-            "course_instructor",
-            kwargs={
-                "course_id": self.object.question.course_id,
-                "instructor_id": self.object.question.instructor_id,
-            },
-        )
+        return reverse_lazy("qa")
 
     def get_object(self):  # pylint: disable=arguments-differ
         """Override DeleteView's function to validate answer belonging to user."""
@@ -151,13 +489,11 @@ def get_object(self):  # pylint: disable=arguments-differ
             raise PermissionDenied("You are not allowed to delete this answer!")
         return obj
 
-    def get_success_message(self, cleaned_data) -> str:
-        """Overrides SuccessMessageMixin's get_success_message method."""
-        # get the course this review is about
-        question = self.object.question
-
-        # return success message
-        return f"Successfully deleted your answer for {str(question)}!"
+    def form_valid(self, form):
+        """Soft-delete answers so nested replies remain visible."""
+        self.object = self.get_object()
+        self.object.soft_delete()
+        return HttpResponseRedirect(self.get_success_url())
 
 
 @login_required
@@ -167,15 +503,12 @@ def new_answer(request):
     if request.method == "POST":
         form = AnswerForm(request.POST)
 
-        print(form)
-
         if form.is_valid():
             instance = form.save(commit=False)
             instance.user = request.user
 
             instance.save()
 
-            messages.success(request, "Successfully added an answer!")
             return HttpResponseRedirect(request.META.get("HTTP_REFERER", "/"))
         messages.error(request, "Invalid Form")
         return HttpResponseRedirect(request.META.get("HTTP_REFERER", "/"))
@@ -188,16 +521,14 @@ def edit_answer(request, answer_id):
     answer = get_object_or_404(Answer, pk=answer_id)
     if answer.user != request.user:
         raise PermissionDenied("You are not allowed to edit this answer!")
+    if answer.is_deleted:
+        raise PermissionDenied("You cannot edit a deleted answer!")
 
     if request.method == "POST":
         form = AnswerForm(request.POST, instance=answer)
         if form.is_valid():
             form.save()
-            messages.success(
-                request,
-                f"Successfully updated your answer for {form.instance.question}!",
-            )
-            answer.created = datetime.datetime.now()
+            answer.created = timezone.now()
             answer.save()
             return HttpResponseRedirect(request.META.get("HTTP_REFERER", "/"))
         messages.error(request, form.errors)
@@ -205,48 +536,44 @@ def edit_answer(request, answer_id):
     return HttpResponseRedirect(request.META.get("HTTP_REFERER", "/"))
 
 
-@login_required()
-def check_duplicate(request):
-    """Check for duplicate answers on qa page when user
-    submits an answer for the same question.
-    Used for an Ajax request in new_review.html"""
-
-    form = AnswerForm(request.POST)
-    if form.is_valid():
-        instance = form.save(commit=False)
-
-        # First check if user has answered the question already
-        answers_on_same_class = request.user.answer_set.filter(
-            question=instance.question
-        )
+@login_required
+def new_reply(request):
+    """Reply creation view (reply to an answer)."""
+    if request.method == "POST":
+        form = ReplyForm(request.POST)
 
-        # An answer already exists so it's a duplicate
-        if answers_on_same_class.exists():
-            response = {"duplicate": True}
-            return JsonResponse(response)
+        if form.is_valid():
+            instance = form.save(commit=False)
+            instance.user = request.user
+            instance.save()
 
-        # User has not answered this question;
-        # proceed with standard form submission
-        response = {"duplicate": False}
-        return JsonResponse(response)
-    return redirect("new_answer")
+            return HttpResponseRedirect(request.META.get("HTTP_REFERER", "/"))
+        messages.error(request, "Invalid Form")
+        return HttpResponseRedirect(request.META.get("HTTP_REFERER", "/"))
+    return HttpResponseRedirect(request.META.get("HTTP_REFERER", "/"))
 
 
 @login_required
 def upvote_answer(request, answer_id):
-    """Upvote a view."""
+    """Upvote an answer."""
     if request.method == "POST":
-        answer = Answer.objects.get(pk=answer_id)
+        answer = get_object_or_404(Answer, pk=answer_id)
         answer.upvote(request.user)
-        return JsonResponse({"ok": True})
+        net = answer.voteanswer_set.aggregate(total=models.Sum("value"))["total"] or 0
+        vote_obj = answer.voteanswer_set.filter(user=request.user).first()
+        user_vote = vote_obj.value if vote_obj else 0
+        return JsonResponse({"ok": True, "votes": net, "user_vote": user_vote})
     return JsonResponse({"ok": False})
 
 
 @login_required
 def downvote_answer(request, answer_id):
-    """Downvote a view."""
+    """Downvote an answer."""
     if request.method == "POST":
-        answer = Answer.objects.get(pk=answer_id)
+        answer = get_object_or_404(Answer, pk=answer_id)
         answer.downvote(request.user)
-        return JsonResponse({"ok": True})
+        net = answer.voteanswer_set.aggregate(total=models.Sum("value"))["total"] or 0
+        vote_obj = answer.voteanswer_set.filter(user=request.user).first()
+        user_vote = vote_obj.value if vote_obj else 0
+        return JsonResponse({"ok": True, "votes": net, "user_vote": user_vote})
     return JsonResponse({"ok": False})