diff --git a/bases/rsptx/interactives/runestone/mchoice/js/mchoice.js b/bases/rsptx/interactives/runestone/mchoice/js/mchoice.js
index 1da216b2d..83bb21d88 100644
--- a/bases/rsptx/interactives/runestone/mchoice/js/mchoice.js
+++ b/bases/rsptx/interactives/runestone/mchoice/js/mchoice.js
@@ -417,7 +417,7 @@ export default class MultipleChoice extends RunestoneBase {
                 studentVoteCount > 1) {
                 this.renderMCMAFeedBack();
             } else {
-                $(this.feedBackDiv).html("<p>Your Answer has been recorded</p>");
+                $(this.feedBackDiv).html("<p>Your answer has been recorded</p>");
                 $(this.feedBackDiv).attr("class", "alert alert-info");
             }
         }
@@ -572,7 +572,7 @@ export default class MultipleChoice extends RunestoneBase {
                 studentVoteCount > 1) {
                 this.renderMCMAFeedBack();
             } else {
-                $(this.feedBackDiv).html("<p>Your Answer has been recorded</p>");
+                $(this.feedBackDiv).html("<p>Your answer has been recorded</p>");
                 $(this.feedBackDiv).attr("class", "alert alert-info");
             }
         }
diff --git a/bases/rsptx/web2py_server/applications/runestone/controllers/peer.py b/bases/rsptx/web2py_server/applications/runestone/controllers/peer.py
index d298360cf..7e5de7980 100644
--- a/bases/rsptx/web2py_server/applications/runestone/controllers/peer.py
+++ b/bases/rsptx/web2py_server/applications/runestone/controllers/peer.py
@@ -711,6 +711,7 @@ def peer_async():
         qnum = int(request.vars.question_num)
 
     current_question, all_done = _get_numbered_question(assignment_id, qnum)
+    assignment = db(db.assignments.id == assignment_id).select().first()
     course = db(db.courses.course_name == auth.user.course_name).select().first()
     course_attrs = getCourseAttributesDict(course.id, course.base_course)
     if "latex_macros" not in course_attrs:
@@ -721,6 +722,7 @@ def peer_async():
         course=get_course_row(db.courses.ALL),
         current_question=current_question,
         assignment_id=assignment_id,
+        assignment_name = assignment.name,
         nextQnum=qnum + 1,
         all_done=all_done,
         **course_attrs,
diff --git a/bases/rsptx/web2py_server/applications/runestone/static/css/peer.css b/bases/rsptx/web2py_server/applications/runestone/static/css/peer.css
index 47ffd5e14..e67543374 100644
--- a/bases/rsptx/web2py_server/applications/runestone/static/css/peer.css
+++ b/bases/rsptx/web2py_server/applications/runestone/static/css/peer.css
@@ -1,5 +1,11 @@
-#pi-instructor-interface .row, #pi-instructor-interface #imessage {
+/* +--------------------------------+ */
+/* | Peer Instruction (PI) Stylesheet | */
+/* +--------------------------------+ */
 
+/* ---------------------- */
+/* Instructor's interface */
+/* ---------------------- */
+#pi-instructor-interface .row, #pi-instructor-interface #imessage {
     margin-right: 0px;
     margin-left: 0px;
     padding-left: 15px;
@@ -158,4 +164,172 @@
 
 .autopermalink {
     display: none;
+}
+
+/* ------------------- */
+/* Student's interface */
+/* ------------------- */
+#pi-student-interface .row, #pi-student-interface #imessage {
+    margin-right: 0px;
+    margin-left: 0px;
+    padding-right: 15px;
+}
+
+#discussion_panel {
+    margin: 20px 0;
+    background: #FBFBFB;
+    border: 0.5px solid #C7CDD1;
+    border-radius: 12px;
+    box-shadow: 0px 20px 24px 0px rgba(17, 17, 17, 0.06);
+    padding-left: 0px;
+    padding-right: 0px;
+}
+
+#discussion-panel-heading {
+    font-size: 22px;
+    font-weight: 500;
+    padding: 12px 24px;
+    background: #FBFBFB;
+    border: 1px solid #C7CDD1;
+    border-radius: 12px 12px 0px 0px;
+    box-shadow: 0px 2px 2px 0px rgba(17, 17, 17, 0.06);
+}
+
+#discussion-panel-heading p {
+    margin: 0;
+}
+
+#discussion-panel-peer-votes {
+    border-bottom: 1px solid #C7CDD1;
+    padding: 16px 24px;
+}
+
+#discussion-panel-peer-votes-content {
+    border-radius: 12px;
+    border: 2px solid #C7CDD1;
+    background: #FFFFFF;
+    padding: 16px 32px;
+}
+
+#discussion-panel-peer-votes-content p {
+    margin: 0;
+    line-height: 28px;
+}
+
+#discussion-panel-peer-votes-content #peerlist {
+    margin-bottom: 8px;
+}
+
+#discussion-panel-messages {
+    padding: 16px 24px;
+}
+
+#discussion-panel-messages #messages {
+    margin: 0;
+    padding-left: 0;
+    padding-right: 10px;
+    min-height: 15vh;
+    max-height: 35vh;
+    overflow-y: auto;
+    display: flex;
+    flex-direction: column;
+}
+
+#discussion-panel-messages #messages > li {
+    margin-top: 8px;
+}
+
+#discussion-panel-messages #messages .outgoing-mess + .incoming-mess,
+#discussion-panel-messages #messages .incoming-mess + .outgoing-mess {
+    margin-top: 16px;
+}
+
+#discussion-panel-messages #messages > li:first-child {
+    margin-top: 0;
+}
+
+#discussion-panel-messages #messages .outgoing-mess, #discussion-panel-messages #messages .incoming-mess {
+    display: flex;
+    flex-direction: column;
+    font-style: normal;
+    color: #333;
+    gap: 4px;
+}
+
+#discussion-panel-messages #messages .outgoing-mess {
+    align-items: end;
+}
+
+#discussion-panel-messages #messages .incoming-mess {
+    align-items: start;
+}
+
+#discussion-panel-messages #messages .sender {
+    display: flex;
+    font-size: 11px;
+    gap: 8px;
+    align-items: center;
+}
+
+#discussion-panel-messages #messages .sender-initials {
+    display: flex;
+    background: #777777;
+    height: 24px;
+    width: 24px;
+    border-radius: 50%;
+    align-items: center;
+    justify-content: center;
+    color: #FFFFFF;
+}
+
+#discussion-panel-messages #messages .sender-name {
+    font-weight: 700;
+}
+
+#discussion-panel-messages #messages .content {
+    border-radius: 15px;
+    padding: 8px 16px;
+}
+
+#discussion-panel-messages #messages .outgoing-mess .sender-initials {
+    order: 2;
+}
+
+#discussion-panel-messages #messages .outgoing-mess .content {
+    background: rgba(215, 241, 249, 0.60);
+}
+
+#discussion-panel-messages #messages .incoming-mess .content {
+    background: rgba(255, 255, 215, 0.60);
+}
+
+#peer-message-box {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: space-between;
+    width: 100%;
+    border-radius: 12px;
+    border: 2px solid #C7CDD1;
+    background: #FFFFFF;
+    padding: 8px 16px;
+    margin-top: 10px;
+    gap: 16px;
+}
+
+#peer-message-box input {
+    width: 100%;
+    border: none;
+}
+
+#sendpeermsg {
+    background: none;
+    margin: 0;
+    padding: 0;
+    display: flex;
+}
+
+#sendpeermsg.disabled {
+    pointer-events: none;
+    opacity: 0.5;
 }
\ No newline at end of file
diff --git a/bases/rsptx/web2py_server/applications/runestone/static/js/peer.js b/bases/rsptx/web2py_server/applications/runestone/static/js/peer.js
index e98f9443d..d748b9daf 100644
--- a/bases/rsptx/web2py_server/applications/runestone/static/js/peer.js
+++ b/bases/rsptx/web2py_server/applications/runestone/static/js/peer.js
@@ -1,4 +1,4 @@
-// Configuration for the PI steps and helper functions to handle step progression
+// Configuration for the PI steps and helper functions to handle step progression in the instructor's interface
 const STEP_CONFIG = {
     vote1: {
         next: ['makep', 'facechat', 'makeabgroups'],
@@ -107,6 +107,42 @@ function handleButtonClick(event) {
     }
 }
 
+// Function to render incoming and outgoing messages for the text chat
+function renderMessage({ from, text, direction }) {
+    // Create message element
+    const message = document.createElement("li");
+    message.classList.add(`${direction}-mess`);
+
+    // Sender container
+    const sender = document.createElement("div");
+    sender.classList.add("sender");
+
+    // Thumbnail using sender initials
+    const senderInitials = document.createElement("div");
+    senderInitials.classList.add("sender-initials");
+    let initials = from.split(" ").map(n => n.charAt(0)).join("").toUpperCase();
+    senderInitials.textContent = initials;
+
+    // Sender name
+    const senderName = document.createElement("div");
+    senderName.classList.add("sender-name");
+    senderName.textContent = direction === "outgoing" ? "You" : from;
+
+    sender.appendChild(senderInitials);
+    sender.appendChild(senderName);
+
+    // Message content
+    const content = document.createElement("div");
+    content.classList.add("content");
+    content.textContent = text;
+
+    // Append sender and content to message
+    message.appendChild(sender);
+    message.appendChild(content);
+
+    return message;
+}
+
 var ws = null;
 var alertSet = false;
 function connect(event) {
@@ -119,15 +155,13 @@ function connect(event) {
     ws.onclose = function () {
         console.log("Websocket Closed")
         alert(
-            "You have been disconnected from the peer instruction server. Will Reconnect."
+            "You have been disconnected from the peer instruction server. Will reconnect."
         );
         connect();
     };
 
     ws.onmessage = function (event) {
-        var messages = document.getElementById("messages");
-        var message = document.createElement("li");
-        message.classList.add("incoming-mess");
+        const messages = document.getElementById("messages");
         let mess = JSON.parse(event.data);
         // This is an easy to code solution for broadcasting that could go out to
         // multiple courses.  It would be better to catch that on the server side
@@ -138,9 +172,15 @@ function connect(event) {
         }
         if (mess.type === "text") {
             if (!(mess.time in messageTrail)) {
-                var content = document.createTextNode(`${mess.from}: ${mess.message}`);
-                message.appendChild(content);
+                let message = renderMessage({
+                    from: mess.from,
+                    text: mess.message,
+                    direction: "incoming"
+                });
+
+                // Append message to messages container
                 messages.appendChild(message);
+                messages.scrollTop = messages.scrollHeight;
                 messageTrail[mess.time] = mess.message;
             }
         } else if (mess.type === "control") {
@@ -275,7 +315,7 @@ function connect(event) {
                     for (const key in adict) {
                         let currAnswer = adict[key];
                         let newpeer = document.createElement("p");
-                        newpeer.innerHTML = `${key} answered ${currAnswer}`;
+                        newpeer.innerHTML = `${key}: <strong>${currAnswer}</strong>`;
                         peerlist.appendChild(newpeer);
                     }
                     break;
@@ -396,31 +436,43 @@ async function sendLtiScores(event) {
 // the server can then broadcast the message or send it to a
 // specific user
 async function sendMessage(event) {
-    var input = document.getElementById("messageText");
-    if (input.value.trim() === "") {
+    const messages = document.getElementById("messages");
+    const input = document.getElementById("messageText");
+    const sendButton = document.getElementById("sendpeermsg");
+    const messageText = input.value.trim();
+
+    if (messageText === "") {
         input.focus();
         return;
     }
+
     let mess = {
         type: "text",
         from: `${user}`,
-        message: input.value,
+        message: messageText,
         time: Date.now(),
         broadcast: false,
         course_name: eBookConfig.course,
         div_id: currentQuestion,
     };
+
     await publishMessage(mess);
-    var messages = document.getElementById("messages");
-    var message = document.createElement("li");
-    message.classList.add("outgoing-mess");
-    var content = document.createTextNode(`${user}: ${input.value}`);
-    message.appendChild(content);
+
+    let message = renderMessage({
+        from: user,
+        text: messageText,
+        direction: "outgoing"
+    });
+
+    // Append message to messages container
     messages.appendChild(message);
+    messages.scrollTop = messages.scrollHeight;
+
     input.value = "";
-    // focus tehe input box again
     input.focus();
-    // not needed for onclick event.preventDefault()
+
+    // Disable the send button after sending a message
+    sendButton.classList.add("disabled");
 }
 
 function warnAndStopVote(event) {
@@ -731,11 +783,25 @@ async function setupPeerGroup() {
 
 $(function () {
     let tinput = document.getElementById("messageText");
-    if (tinput) {
-        tinput.addEventListener("keyup", function (event) {
-            if (event.keyCode === 13) {
+    let sendButton = document.getElementById("sendpeermsg");
+
+    if (tinput && sendButton) {
+        tinput.addEventListener("input", function () {
+            let message = this.value.trim();
+            if (message !== "") {
+                sendButton.classList.remove("disabled");
+            } else {
+                sendButton.classList.add("disabled");
+            }
+        });
+
+        tinput.addEventListener("keydown", function (event) {
+            if (event.key === "Enter") {
                 event.preventDefault();
-                document.getElementById("sendpeermsg").click();
+                let message = this.value.trim();
+                if (message != "") {
+                    document.getElementById("sendpeermsg").click();
+                }
             }
         });
     }
diff --git a/bases/rsptx/web2py_server/applications/runestone/views/peer/dashboard.html b/bases/rsptx/web2py_server/applications/runestone/views/peer/dashboard.html
index a12624c5d..dea920732 100644
--- a/bases/rsptx/web2py_server/applications/runestone/views/peer/dashboard.html
+++ b/bases/rsptx/web2py_server/applications/runestone/views/peer/dashboard.html
@@ -6,10 +6,12 @@
     rel="stylesheet"
     href="{{=URL('static','css/peer.css')}}?v={{=request.peer_mtime}}"
 />
+
 <script>
     eBookConfig.peer = true;
     var voteStopped = false;
 </script>
+
 <div class="hidden-content" style="display: none">
     \( {{=XML(latex_macros)}} \)
  </div>
@@ -124,7 +126,7 @@ <h3>Question {{ =current_qnum }} of {{ =num_questions }}</h3>
                                 onclick="enableFaceChat(event)"
                                 disabled
                             >
-                                Enable in-person Chat
+                                Enable In-Person Chat
                             </button>
                             OR
                             <button
@@ -145,7 +147,7 @@ <h3>Question {{ =current_qnum }} of {{ =num_questions }}</h3>
                                     onclick="makePartners(event, true)"
                                     disabled
                                 >
-                                    Run AB Experiment
+                                    Run A/B Experiment
                                 </button>
                             {{ pass }}
                         </div>
diff --git a/bases/rsptx/web2py_server/applications/runestone/views/peer/peer_question.html b/bases/rsptx/web2py_server/applications/runestone/views/peer/peer_question.html
index a7eb2b871..e25ee8c38 100644
--- a/bases/rsptx/web2py_server/applications/runestone/views/peer/peer_question.html
+++ b/bases/rsptx/web2py_server/applications/runestone/views/peer/peer_question.html
@@ -4,6 +4,11 @@
 {{include '_sphinx_static_files.html'}}
 {{end}}
 
+<link
+    rel="stylesheet"
+    href="{{=URL('static','css/peer.css')}}?v={{=request.peer_mtime}}"
+/>
+
 <script>
     eBookConfig.peer = true;
     var assignment_id = {{=assignment_id }};
@@ -14,46 +19,73 @@
 </div>
 
 <h2>Peer Instruction: {{=assignment_name}}</h2>
-<div id="imessage">
 
-</div>
-<div class="row">
-    <div class="col-md-6">
-        <form action="/runestone/peer/peer_question" method="GET" id="nextqform">
-            <input type="hidden" name="assignment_id" value={{=assignment_id}}>
-        </form>
-    </div>
-</div>
+<div id="pi-student-interface">
+    <div id="imessage"></div>
 
-<div class="row">
-    <div class='oneq col-md-6 runestone-sphinx'>
-        {{=XML(current_question['htmlsrc'])}}
-    </div>
-    <div id="discussion_panel" class='col-md-6' style="display: none">
-        <p>Your answer <span id="first_answer"></span></p>
-        <div id="peerlist">
+    <div class="row">
+        <div class="col-md-6">
+            <form action="/runestone/peer/peer_question" method="GET" id="nextqform">
+                <input type="hidden" name="assignment_id" value={{=assignment_id}}>
+            </form>
         </div>
-        <p>Please discuss the answers with your group members</p>
-        <div>
-            <ul id="messages" class="conversation">
+    </div>
 
-            </ul>
+    <div class="row">
+        <div class='oneq col-md-6 runestone-sphinx'>
+            {{=XML(current_question['htmlsrc'])}}
         </div>
 
-        <textarea id="messageText" rows="6" style="width: 350px;">
-</textarea>
-        <div class="text-center" style="width: 350px;">
-            <button id="sendpeermsg" type="button" onclick="sendMessage()">Send</button>
+        <div id="discussion_panel" class='col-md-6' style="display: none">
+             <div id="discussion-panel-heading">
+                <p>Peer Chat</p>
+            </div>
+
+            <div id="discussion-panel-peer-votes">
+                <div id="discussion-panel-peer-votes-content">
+                    <p>Here is what everyone answered:</p>
+                    <div id="peerlist">
+                        <p>You: <strong><span id="first_answer"></span></strong></p>
+                    </div>
+                    <p>Please discuss your answers now :)</p>
+                </div>
+            </div>
+
+            <div id="discussion-panel-messages">
+                <ul id="messages" class="conversation"></ul>
+                <div id="peer-message-box">
+                    <!-- <textarea id="messageText" rows="6" style="width: 350px;" /> -->
+                    <input type="text" id="messageText" placeholder="Type your explanation here...">
+                    <button
+                        id="sendpeermsg"
+                        class="btn disabled"
+                        onclick="sendMessage()"
+                        aria-label="Send message"
+                    >
+                        <svg
+                            xmlns="http://www.w3.org/2000/svg"
+                            width="24"
+                            height="24"
+                            fill="currentColor"
+                            class="bi bi-arrow-up-circle-fill"
+                            viewBox="0 0 16 16"
+                            aria-hidden="true"
+                        >
+                            <path d="M16 8A8 8 0 1 0 0 8a8 8 0 0 0 16 0m-7.5 3.5a.5.5 0 0 1-1 0V5.707L5.354 7.854a.5.5 0 1 1-.708-.708l3-3a.5.5 0 0 1 .708 0l3 3a.5.5 0 0 1-.708.708L8.5 5.707z"/>
+                        </svg>
+                    </button>
+                </div>
+            </div>
         </div>
 
+        <div id="group_select_panel" class="col-md-6" style="display: none;">
+            <p><strong>In person discussion:</strong> select the people in your discussion group.</p>
+            <select id="assignment_group" multiple class="assignment_partner_select" style="width: 95%">
+            </select>
+        </div>
     </div>
-    <div id="group_select_panel" class="col-md-6" style="display: none;">
-        <p><strong>In person discussion:</strong> select the people in your discussion group.</p>
-        <select id="assignment_group" multiple class="assignment_partner_select" style="width: 95%">
-        </select>
-    </div>
-
 </div>
+
 <p>Please do not leave or refresh the page during a peer instruction session. <strong>Exception:</strong> If you should
     have seen a new question at this point then you may continue.</p>
 
@@ -131,7 +163,7 @@ <h2>Peer Instruction: {{=assignment_name}}</h2>
             event.preventDefault();
             event.returnValue =
                 "Please do not leave or refresh the page during a peer instruction session.";
-            return "Please do not leave or refresh the page during a peer instruction session.  Exception: If you should have seen a new question at this point then you may continue.";
+            return "Please do not leave or refresh the page during a peer instruction session. Exception: If you should have seen a new question at this point then you may continue.";
         }.bind(this)
     );
 
diff --git a/projects/rsmanage/poetry.lock b/projects/rsmanage/poetry.lock
index c27d3de74..edad936b3 100644
--- a/projects/rsmanage/poetry.lock
+++ b/projects/rsmanage/poetry.lock
@@ -1,4 +1,4 @@
-# This file is automatically @generated by Poetry 2.1.3 and should not be changed by hand.
+# This file is automatically @generated by Poetry 2.1.1 and should not be changed by hand.
 
 [[package]]
 name = "aiosqlite"
@@ -202,7 +202,7 @@ files = [
     {file = "async-timeout-4.0.3.tar.gz", hash = "sha256:4640d96be84d82d02ed59ea2b7105a0f7b33abe8703703cd0ab0bf87c427522f"},
     {file = "async_timeout-4.0.3-py3-none-any.whl", hash = "sha256:7405140ff1230c310e51dc27b3145b9092d659ce68ff733fb0cefe3ee42be028"},
 ]
-markers = {main = "python_full_version <= \"3.11.2\"", dev = "python_version == \"3.10\""}
+markers = {main = "python_full_version <= \"3.11.2\"", dev = "python_version < \"3.11\""}
 
 [[package]]
 name = "asyncclick"
@@ -329,7 +329,7 @@ description = "Backport of Python 3.11's datetime.fromisoformat"
 optional = false
 python-versions = ">3"
 groups = ["main"]
-markers = "python_version == \"3.10\""
+markers = "python_version < \"3.11\""
 files = [
     {file = "backports_datetime_fromisoformat-2.0.3-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:5f681f638f10588fa3c101ee9ae2b63d3734713202ddfcfb6ec6cea0778a29d4"},
     {file = "backports_datetime_fromisoformat-2.0.3-cp310-cp310-macosx_11_0_universal2.whl", hash = "sha256:cd681460e9142f1249408e5aee6d178c6d89b49e06d44913c8fdfb6defda8d1c"},
@@ -949,7 +949,7 @@ description = "Backport of PEP 654 (exception groups)"
 optional = false
 python-versions = ">=3.7"
 groups = ["main", "dev"]
-markers = "python_version == \"3.10\""
+markers = "python_version < \"3.11\""
 files = [
     {file = "exceptiongroup-1.2.2-py3-none-any.whl", hash = "sha256:3111b9d131c238bec2f8f516e123e14ba243563fb135d3fe885990585aa7795b"},
     {file = "exceptiongroup-1.2.2.tar.gz", hash = "sha256:47c2edf7c6738fafb49fd34290706d1a1a2f4d1c6df275526b62cbb4aa5393cc"},
@@ -2438,9 +2438,9 @@ files = [
 
 [package.dependencies]
 numpy = [
-    {version = ">=1.26.0", markers = "python_version >= \"3.12\""},
     {version = ">=1.22.4", markers = "python_version < \"3.11\""},
     {version = ">=1.23.2", markers = "python_version == \"3.11\""},
+    {version = ">=1.26.0", markers = "python_version >= \"3.12\""},
 ]
 python-dateutil = ">=2.8.2"
 pytz = ">=2020.1"
@@ -3111,8 +3111,8 @@ files = [
 annotated-types = ">=0.6.0"
 pydantic-core = "2.23.4"
 typing-extensions = [
-    {version = ">=4.12.2", markers = "python_version >= \"3.13\""},
     {version = ">=4.6.1", markers = "python_version < \"3.13\""},
+    {version = ">=4.12.2", markers = "python_version >= \"3.13\""},
 ]
 
 [package.extras]
@@ -4641,7 +4641,7 @@ description = "A lil' TOML parser"
 optional = false
 python-versions = ">=3.8"
 groups = ["main", "dev"]
-markers = "python_version == \"3.10\""
+markers = "python_version < \"3.11\""
 files = [
     {file = "tomli-2.0.2-py3-none-any.whl", hash = "sha256:2ebe24485c53d303f690b0ec092806a085f07af5a5aa1464f3931eec36caaa38"},
     {file = "tomli-2.0.2.tar.gz", hash = "sha256:d46d457a85337051c36524bc5349dd91b1877838e2979ac5ced3e710ed8a60ed"},