Index: lams_central/src/java/org/lamsfoundation/lams/comments/web/CommentController.java
===================================================================
diff -u -r3282e8325662ca873b88ceb07e627315d415a2c6 -rf14a45648947b8813b4b99842665fcf87f5dfbed
--- lams_central/src/java/org/lamsfoundation/lams/comments/web/CommentController.java	(.../CommentController.java)	(revision 3282e8325662ca873b88ceb07e627315d415a2c6)
+++ lams_central/src/java/org/lamsfoundation/lams/comments/web/CommentController.java	(.../CommentController.java)	(revision f14a45648947b8813b4b99842665fcf87f5dfbed)
@@ -156,10 +156,7 @@
 	sessionMap.put(CommentConstants.ATTR_ROOT_COMMENT_UID, rootComment.getUid());
 
 	prepareViewTopicData(request, sessionMap, pageSize, sortBy, true);
-
-	boolean newUI = WebUtil.readBooleanParam(request, "newUI", false);
-	String viewDir = newUI ? "comments5" : "comments";
-	return viewDir + "/comments";
+	return "comments/comments";
     }
 
     private void throwException(String msg, String loginName, Long externalId, Integer externalType,
@@ -212,10 +209,7 @@
 	}
 
 	prepareViewTopicData(request, sessionMap, pageSize, sortBy, sticky);
-
-	boolean newUI = WebUtil.readBooleanParam(request, "newUI", false);
-	String viewDir = newUI ? "comments5" : "comments";
-	return viewDir + (sticky ? "/allviewwrapper" : "/topicviewwrapper");
+	return "comments" + (sticky ? "/allviewwrapper" : "/topicviewwrapper");
     }
 
     private void prepareViewTopicData(HttpServletRequest request, SessionMap<String, Object> sessionMap,
@@ -298,10 +292,7 @@
 
 	// don't want to try to scroll as this is a single thread, completely displayed.
 	request.setAttribute(CommentConstants.ATTR_NO_MORE_PAGES, true);
-
-	boolean newUI = WebUtil.readBooleanParam(request, "newUI", false);
-	String viewDir = newUI ? "comments5" : "comments";
-	return viewDir + "/topicviewwrapper";
+	return "comments/topicviewwrapper";
     }
 
     /**
@@ -391,10 +382,7 @@
 		request.getParameter(CommentConstants.ATTR_SESSION_MAP_ID));
 	request.setAttribute(CommentConstants.ATTR_PARENT_COMMENT_ID,
 		request.getParameter(CommentConstants.ATTR_PARENT_COMMENT_ID));
-
-	boolean newUI = WebUtil.readBooleanParam(request, "newUI", false);
-	String viewDir = newUI ? "comments5" : "comments";
-	return viewDir + "/reply";
+	return "comments/reply";
     }
 
     /**
@@ -482,10 +470,7 @@
 	request.setAttribute(CommentConstants.ATTR_COMMENT_ID, commentId);
 	request.setAttribute(CommentConstants.ATTR_COMMENT, comment);
 	request.setAttribute(CommentConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
-	
-	boolean newUI = WebUtil.readBooleanParam(request, "newUI", false);
-	String viewDir = newUI ? "comments5" : "comments";
-	return viewDir + "/edit";
+	return "comments/edit";
     }
 
     /**
Index: lams_central/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -r3282e8325662ca873b88ceb07e627315d415a2c6 -rf14a45648947b8813b4b99842665fcf87f5dfbed
--- lams_central/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 3282e8325662ca873b88ceb07e627315d415a2c6)
+++ lams_central/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision f14a45648947b8813b4b99842665fcf87f5dfbed)
@@ -15,7 +15,6 @@
 <%@ attribute name="sortBy" required="false" rtexprvalue="true"%>
 <%@ attribute name="embedInAccordian" required="false" rtexprvalue="true"%>
 <%@ attribute name="accordionTitle" required="false" rtexprvalue="true"%>
-<%@ attribute name="bootstrap5" required="false" rtexprvalue="true"%>
 
 <c:if test="${empty width}">
 	<c:set var="width" value="100%" />
@@ -73,7 +72,7 @@
 
 <script>
 	$(document).ready(function(){
-		var url='<lams:LAMSURL/>comments/init.do?externalID=${toolSessionId}&newUI=${bootstrap5}&externalSecondaryID=${toolItemId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}&anonymous=${anonymous}';
+		var url='<lams:LAMSURL/>comments/init.do?externalID=${toolSessionId}&externalSecondaryID=${toolItemId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}&anonymous=${anonymous}';
 		
 		<c:choose>
 			<c:when test="${embedInAccordian}">
Index: lams_central/web/WEB-INF/tags/Notebook.tag
===================================================================
diff -u -r06770d77acb444693664d588e5d2e8570adb96aa -rf14a45648947b8813b4b99842665fcf87f5dfbed
--- lams_central/web/WEB-INF/tags/Notebook.tag	(.../Notebook.tag)	(revision 06770d77acb444693664d588e5d2e8570adb96aa)
+++ lams_central/web/WEB-INF/tags/Notebook.tag	(.../Notebook.tag)	(revision f14a45648947b8813b4b99842665fcf87f5dfbed)
@@ -85,7 +85,7 @@
 					<div class="row g-0"><div class="col-12"></div></div>
 					<lams:Comments toolSessionId="${toolSessionID}"
 								   toolSignature="lanb11" likeAndDislike="${likeAndDislike}" readOnly="true"
-								   pageSize="10" sortBy="1" bootstrap5="true"/>
+								   pageSize="10" sortBy="1"/>
 				</c:if>
 			</c:if>
 		
Index: lams_central/web/comments/allview.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rf14a45648947b8813b4b99842665fcf87f5dfbed
--- lams_central/web/comments/allview.jsp	(.../allview.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/comments/allview.jsp	(.../allview.jsp)	(revision f14a45648947b8813b4b99842665fcf87f5dfbed)
@@ -1,27 +1,45 @@
-<!-- Wraps up both the sticky and non-sticky comments. Used for page refresh and changing the sort.
- -->
+<!-- Wraps up both the sticky and non-sticky comments. Used for page refresh and changing the sort.-->
 
-			<!--  if sticky comments exists, they need to be displayed first, but do not clobber the non sticky threads! -->
-			<c:set var="nonsticky" value="${commentThread}"/>
-			<c:set var="commentThread" value="${sticky}"/>
-			<c:set var="noMorePages" value="true"/>
-			<div id="stickyComments">
-			<%@ include file="topicview.jsp"%>
-			</div>			
-			<c:set var="commentThread" value="${nonsticky}"/>
-			<c:set var="noMorePages" value="false"/>
-				
-			<div id="newcomments"></div>			
+<div class="mb-2 float-end">
+	<select id="sortMenu" name="sortMenu" class="form-control float-end w-auto">
+		<option value='0'
+			<c:if test='${sessionMap.sortBy == 0}'>selected</c:if>>
+				<fmt:message key="label.newest.first" />
+		</option>
+		<option value='1'
+				<c:if test='${sessionMap.sortBy == 1}'>selected</c:if>>
+			<fmt:message key="label.top.comments" />
+		</option>
+	</select>
+</div>
 
-			<c:if test='${(empty commentThread) && (sessionMap.mode == "teacher")}'>
-				<fmt:message key="label.no.comments"/>
-			</c:if>
-					
-			<div class="scroll" >
-			<c:if test="${! empty commentThread}">
-			<%@ include file="topicview.jsp"%>
-			</c:if>
-			</div>
-			<script>
-				$('.scroll').jscroll({loadingHtml: '<img src="${loading_animation}" alt="${loading_words}" />${loading_words}',padding:30,autoTrigger:false,callback:scrollDoneCallback});
-			</script>
\ No newline at end of file
+<!--  if sticky comments exists, they need to be displayed first, but do not clobber the non sticky threads! -->
+<c:set var="nonsticky" value="${commentThread}" />
+<c:set var="commentThread" value="${sticky}" />
+<c:set var="noMorePages" value="true" />
+<div id="stickyComments">
+	<%@ include file="topicview.jsp"%>
+</div>
+<c:set var="commentThread" value="${nonsticky}" />
+<c:set var="noMorePages" value="false" />
+
+<div id="newcomments"></div>
+
+<c:if test='${(empty commentThread) && (sessionMap.mode == "teacher")}'>
+	<fmt:message key="label.no.comments" />
+</c:if>
+
+<div class="scroll">
+	<c:if test="${! empty commentThread}">
+		<%@ include file="topicview.jsp"%>
+	</c:if>
+</div>
+
+<script>
+	$('.scroll').jscroll({
+		loadingHtml: '<img src="${loading_animation}" alt="${loading_words}" />${loading_words}',
+		padding:30,
+		autoTrigger:false,
+		callback:scrollDoneCallback
+	});
+</script>
\ No newline at end of file
Index: lams_central/web/comments/allviewwrapper.jsp
===================================================================
diff -u -r4c2d1f37b92435907ec4ce23cb635a7cd9e4161e -rf14a45648947b8813b4b99842665fcf87f5dfbed
--- lams_central/web/comments/allviewwrapper.jsp	(.../allviewwrapper.jsp)	(revision 4c2d1f37b92435907ec4ce23cb635a7cd9e4161e)
+++ lams_central/web/comments/allviewwrapper.jsp	(.../allviewwrapper.jsp)	(revision f14a45648947b8813b4b99842665fcf87f5dfbed)
@@ -1,13 +1,10 @@
 <!DOCTYPE html>
 <%@ include file="/common/taglibs.jsp"%>
-
-<!-- Wraps up allview.jsp for refresh/sort change. -->
-
-<c:set var="lams">
-	<lams:LAMSURL />
-</c:set>
+<c:set var="lams"><lams:LAMSURL /></c:set>
 <c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request" />
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+
+<!-- Wraps up allview.jsp for refresh/sort change. -->
 <script type="text/javascript" src="${lams}includes/javascript/jquery.treetable.js"></script>
 
 <%@ include file="allview.jsp"%>
Index: lams_central/web/comments/anonymouscheckbox.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rf14a45648947b8813b4b99842665fcf87f5dfbed
--- lams_central/web/comments/anonymouscheckbox.jsp	(.../anonymouscheckbox.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/comments/anonymouscheckbox.jsp	(.../anonymouscheckbox.jsp)	(revision f14a45648947b8813b4b99842665fcf87f5dfbed)
@@ -1,23 +1,35 @@
-	<c:choose>
+<script type="text/javascript">
+	$(document).ready(function() {
+		$('[data-bs-toggle="popover"]').each((i, el) => {
+			new bootstrap.Popover($(el), {
+				content: '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.anonymous.tooltip"/></spring:escapeBody>'
+			})
+		});
+	});
+</script>
+
+<c:choose>
 	<c:when test="${sessionMap.mode == 'teacher'}">
 		<%-- include the value so it gets returned but do not allow it to be edited --%>
-		<input type="hidden" id="${anonymousCheckboxName}" name="${anonymousCheckboxName}" value="${anonymousCheckboxChecked ? 'true' : 'false'}"/>
+		<input type="hidden" id="${anonymousCheckboxName}" name="${anonymousCheckboxName}"
+			value="${anonymousCheckboxChecked ? 'true' : 'false'}"
+		/>
 	</c:when>
 
 	<c:otherwise>
-		<div class="checkbox form-control-inline">
-		<label for="${anonymousCheckboxName}">
-		<input type="checkbox" id="${anonymousCheckboxName}" name="${anonymousCheckboxName}" value="true" ${anonymousCheckboxChecked ? 'checked="checked"' : ''}><fmt:message key="label.post.anonomously" />
-		</label>
-		</div>&nbsp;<a tabindex="0" role="button" data-toggle="popover"><i class="fa fa-info-circle"></i></a>
- 		<%-- Use c:out to escape any quotes in the I18N string. Then use html: true converts any escaped quotes back --%>
-		<%-- into real quotes. Should be safe from XSS attack as the string is coming from a translation file. --%>	
-		<fmt:message key="label.anonymous.tooltip" var="ANONYMOUS_TOOLTIP_VAR"></fmt:message>		
- 		<script type="text/javascript">
-		$(document).ready(function() {
-			var ANONYMOUS_TOOLTIP = '<c:out value="${ANONYMOUS_TOOLTIP_VAR}" />';
-	    		$('[data-toggle="popover"]').popover({title: "", content: ANONYMOUS_TOOLTIP, placement:"auto right", delay: 50, trigger:"hover focus", html: true});
-		});
-		</script>
+		<div class="form-check form-check-reverse mt-2">
+			<input type="checkbox" id="${anonymousCheckboxName}" class="form-check-input"
+				name="${anonymousCheckboxName}" value="true" ${anonymousCheckboxChecked ? 'checked="checked"' : ''}
+				aria-description='<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.anonymous.tooltip"/></spring:escapeBody>'
+			>
+				
+			<label for="${anonymousCheckboxName}" class="form-check-label">
+				<fmt:message key="label.post.anonomously" />
+			</label>
+
+			<span data-bs-toggle="popover" data-bs-placement="right" data-bs-trigger="hover focus" aria-hidden="true">
+	  			<i class="fa fa-info-circle"></i>
+			</span>
+		</div>
 	</c:otherwise>
-	</c:choose>
+</c:choose>
Index: lams_central/web/comments/comments.jsp
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -rf14a45648947b8813b4b99842665fcf87f5dfbed
--- lams_central/web/comments/comments.jsp	(.../comments.jsp)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_central/web/comments/comments.jsp	(.../comments.jsp)	(revision f14a45648947b8813b4b99842665fcf87f5dfbed)
@@ -1,71 +1,156 @@
 <!DOCTYPE html>
 <%@ include file="/common/taglibs.jsp"%>
-<c:set var="lams">
-	<lams:LAMSURL />
-</c:set>
+<c:set var="lams"><lams:LAMSURL /></c:set>
 <c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request" />
 <c:set var="loading_animation" value="${lams}images/ajax-loader.gif"/>
 <c:set var="loading_words"><fmt:message key="msg.loading" /></c:set>
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+<%@ page import="org.lamsfoundation.lams.comments.CommentConstants"%>
 
-<lams:html>
-	<lams:head>
-		
-		<!-- ********************  CSS ********************** -->
-		<lams:css />
-		<lams:css suffix="treetable"/>
-		
-		<!-- ********************  javascript ********************** -->
-		<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/jquery-ui.js"></script>
-		<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/jquery.jscroll.js"></script>
-		<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/jquery.treetable.js"></script>
-		<lams:JSImport src="includes/javascript/comments.js" />
-		<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/jquery.timeago.js"></script>		
+<!-- ********************  CSS ********************** -->
+<lams:css suffix="treetable" />
 
-		<script type="text/javascript">
-			$(document).ready(function(){
-			    scrollDoneCallback();
-			    
-   				$('#sortMenu').change(function(){
-			        var url = "<lams:LAMSURL />comments/viewTopic.do?sessionMapID=${sessionMapID}&sticky=true&sortBy="+$(this).find("option:selected").attr('value');
-			        reloadDivs(url);
-			    });
-			});
-			
-			function refreshComments(){
-				var reqIDVar = new Date();
-				reloadDivs('<lams:LAMSURL />comments/viewTopic.do?sessionMapID=${sessionMapID}&sticky=true&reqUid='+reqIDVar.getTime());
-			}
+<!-- ********************  javascript ********************** -->
+<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/jquery.jscroll.js"></script>
+<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/jquery.treetable.js"></script>
+<lams:JSImport src="includes/javascript/comments.js" />
+<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/jquery.timeago.js"></script>
+<script type="text/javascript">
+	$(document).ready(function() {
+		scrollDoneCallback();
 
-			function reloadDivs(url) {
-				$('.scroll').data('jscroll', null);
-				$.ajaxSetup({ cache: true });
-				$('#commentDiv').load(url);
-			}
-			
-			function scrollDoneCallback() {
-			}
-		</script>		
+		$("#commentDiv").on("change", "#sortMenu", function() {
+			var url = "<lams:LAMSURL />comments/viewTopic.do?sessionMapID=${sessionMapID}&sticky=true&sortBy="
+					+ $(this).find("option:selected").attr('value');
+			reloadDivs(url);
+		});
+
+		$('#newForm').submit(function() { // catch the form's submit event
+			newCommentSubmit();
+		});
+	});
+
+	function refreshComments() {
+		var reqIDVar = new Date();
+		reloadDivs('<lams:LAMSURL />comments/viewTopic.do?sessionMapID=${sessionMapID}&sticky=true&reqUid='
+				+ reqIDVar.getTime());
+	}
+
+	function reloadDivs(url) {
+		$('.scroll').data('jscroll', null);
+		$.ajaxSetup({
+			cache : true
+		});
+		$('#commentDiv').load(url);
+	}
+
+	function scrollDoneCallback() {
+	}
+
+	var btnName = "newCommentSubmitButton";
+
+	function newCommentSubmit() {
+		if ( isDisabled(btnName) ) {
+			return false;
+		}
 		
-	</lams:head>
-	<body>
-		
-			<div class="voffset10">
-			<c:if test='${not sessionMap.readOnly}'>
-              <div class="comments"> 
-			<%@ include file="new.jsp"%>
-              </div>
-			</c:if>
+		var theForm = $(newForm);
+		disableButton(btnName);
 
-			
-			<select id="sortMenu" name="sortMenu" class="form-control">
-    			<option value='0' <c:if test='${sessionMap.sortBy == 0}'>selected</c:if>><fmt:message key="label.newest.first"/></option>
-    			<option value='1' <c:if test='${sessionMap.sortBy == 1}'>selected</c:if>><fmt:message key="label.top.comments"/></option>
-			</select>
+		if (validateBodyText(
+			$('#newFormBody').val(),
+			<%=CommentConstants.MAX_BODY_LENGTH%>,
+			"<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.comment.body.validation" /></spring:escapeBody>"
+		)) {
+			$.ajax({ // create an AJAX call...
+				data : theForm.serialize(),
+				processData : false, // tell jQuery not to process the data
+				contentType : false, // tell jQuery not to set contentType
+				type : theForm.attr('method'), // GET or POST
+				url : theForm.attr('action'), // the file to call  
+				
+			}).done(function(response) {
+								var threadUid = response.threadUid;
+								var commentUid = response.commentUid;
+								var sessionMapID = response.sessionMapID;
 
-			<div id="commentDiv" class="voffset2">
-			<%@ include file="allview.jsp"%>
-			</div>	
+								// have just added it as a standalone comment, so show the posting at the top. 
+								var newCommentDiv = document.getElementById('newcomments');
+								var newThreadDiv = document.createElement("div");
+								newThreadDiv.id = 'thread' + commentUid;
+								newCommentDiv.insertBefore(newThreadDiv, newCommentDiv.firstChild);
+
+								if (!newCommentDiv || !newThreadDiv) {
+									alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="error.cannot.redisplay.please.refresh"/></spring:escapeBody>');
+								} else if (commentUid) {
+									var loadString = '<lams:LAMSURL />comments/viewTopicThread.do?sessionMapID='
+											+ response.sessionMapID
+											+ "&threadUid="
+											+ threadUid
+											+ "&commentUid=" + commentUid;
+									$.ajaxSetup({ cache: true });
+									$(newThreadDiv).load(loadString,
+											function() {
+												highlightMessage();
+											});
+									clearNewForm();
+								} else if (response.errMessage) {
+									alert(response.errMessage);
+									enableButton(btnName);
+								} else {
+									alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="error.please.refresh"/></spring:escapeBody>');
+								}
+			});
+		} // end validateBodyText
+		else {
+			enableButton(btnName);
+		}
+		return false;
+	}
+
+	function clearNewForm() {
+		$('#newFormBody').val('');
+		$('#commentAnonymousNew').prop('checked',false);
+		enableButton(btnName);
+		return false;
+	}
+</script>
+	
+<c:if test='${not sessionMap.readOnly}'>
+	<div class="card lcard mb-4">
+	<div class="card-body">
+		<div class="comments my-3">
+			<div class="comment-entry">
+				<form id="newForm" method="GET" action="<lams:LAMSURL />comments/newComment.do">
+					<input type="hidden" id="sessionMapID" name="sessionMapID" value="${sessionMapID}" />
+					
+					<textarea class="form-control" placeholder="..." id="newFormBody"
+						maxlength="<%=CommentConstants.MAX_BODY_LENGTH + 2%>" name="body" class="comment" aria-label="comment"></textarea>
+					
+					<div class="clearfix mt-3">
+						<button type="button" onclick="javascript:newCommentSubmit();"
+								class="btn btn-secondary btn-sm float-end btn-icon-comment" id="newCommentSubmitButton">
+							<fmt:message key="label.post" />
+						</button>
+						
+						<button type="button" onclick="javascript:clearNewForm();"
+								class="btn btn-secondary btn-sm btn-icon-cancel float-end me-2">
+							<fmt:message key="label.cancel" />
+						</button>
+					</div>
+						
+					<c:if test="${sessionMap.anonymous}">
+						<c:set var="anonymousCheckboxChecked" value="" />
+						<c:set var="anonymousCheckboxName" value="commentAnonymousNew" />
+						<%@include file="anonymouscheckbox.jsp"%>
+					</c:if>
+				</form>
 			</div>
-	</body>
-</lams:html>
\ No newline at end of file
+		</div>
+	</div>
+	</div>
+</c:if>
+
+<div id="commentDiv" class="mt-1">
+	<%@ include file="allview.jsp"%>
+</div>
\ No newline at end of file
Index: lams_central/web/comments/edit.jsp
===================================================================
diff -u -r3282e8325662ca873b88ceb07e627315d415a2c6 -rf14a45648947b8813b4b99842665fcf87f5dfbed
--- lams_central/web/comments/edit.jsp	(.../edit.jsp)	(revision 3282e8325662ca873b88ceb07e627315d415a2c6)
+++ lams_central/web/comments/edit.jsp	(.../edit.jsp)	(revision f14a45648947b8813b4b99842665fcf87f5dfbed)
@@ -1,5 +1,6 @@
 <%@ include file="/common/taglibs.jsp"%>
 <%@ page import="org.lamsfoundation.lams.comments.CommentConstants"%>
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 
 <script type="text/javascript">
 	// The treetable code uses the clicks to expand and collapse the replies but then 
@@ -48,7 +49,12 @@
 					// make sure the old edit form is gone, so the user won't try to submit it again
 					$('#edit').remove();
 				}
-				reloadThread(response,'<lams:LAMSURL />',false,'<spring:escapeBody javaScriptEscape="true"><fmt:message key="error.cannot.redisplay.please.refresh"/></spring:escapeBody>','<spring:escapeBody javaScriptEscape="true"><fmt:message key="error.please.refresh"/></spring:escapeBody>');
+				reloadThread(
+					response,
+					'<lams:LAMSURL />',
+					'<spring:escapeBody javaScriptEscape="true"><fmt:message key="error.cannot.redisplay.please.refresh"/></spring:escapeBody>',
+					'<spring:escapeBody javaScriptEscape="true"><fmt:message key="error.please.refresh"/></spring:escapeBody>'
+				);
     		});
 		} // end validateBodyText
 		else {
@@ -60,44 +66,37 @@
 	function cancelEdit() {
 		$('#edit').remove();
 	}
-	
 </script>
 
-<div class="comment-entry form-group voffset5">
-<form id="editForm" method="GET" action="<lams:LAMSURL />comments/updateTopicInline.do">
-	<textarea class="form-control"  id="editFormBody" maxlength="<%=CommentConstants.MAX_BODY_LENGTH+2%>" name="body" class="comment">${comment.comment.body}</textarea>
-	<input type="hidden" id="sessionMapID" name="sessionMapID" value="${sessionMapID}"/>
-	<input type="hidden" id="commentUid" name="commentUid" value="${commentUid}"/>
-	
-	<div class="row voffset5">
-	<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+<div class="card lcard m-2">
+<div class="card-body">
+<div class="comment-entry form-group">
+	<form id="editForm" method="GET" action="<lams:LAMSURL />comments/updateTopicInline.do">
+		<textarea class="form-control" id="editFormBody" maxlength="<%=CommentConstants.MAX_BODY_LENGTH + 2%>" name="body"
+			class="comment"
+		>${comment.comment.body}</textarea>
+		<input type="hidden" id="sessionMapID" name="sessionMapID" value="${sessionMapID}" /> 
+		<input type="hidden" id="commentUid" name="commentUid" value="${commentUid}"/>
 
- 	<c:choose>
- 	<c:when test="${sessionMap.anonymous}">
- 	<%-- Post Anonymously? --%>
-	<div class="col-xs-12 col-sm-6">
-		<c:set var="anonymousCheckboxChecked" value="${comment.comment.anonymous}"/>
-		<c:set var="anonymousCheckboxName" value="commentAnonymousEdit"/>
-		<%@include file="anonymouscheckbox.jsp" %>
- 	</div>
-
-	<%-- Cancel / Edit Buttons --%>
-	<div class="col-xs-12 col-sm-6">
-	</c:when>
-	<c:otherwise>
-	<div class="col-xs-12">
-	</c:otherwise>
-	</c:choose>
-	<a href="#nogo" onclick="javascript:editCommentSubmit();" class="btn btn-xs btn-primary pull-right" id="editCommentSubmitButton">
-		<fmt:message key="label.post" />
-	</a>&nbsp;
-	<a href="#nogo" onclick="javascript:cancelEdit();" class="btn btn-xs btn-primary pull-right roffset5">
-		<fmt:message key="label.cancel" />
-	</a>
-	</div>
-
-</form>
+		<div class="mt-3">
+			<div class="clearfix">
+				<button type="button" onclick="javascript:editCommentSubmit();" class="btn btn-sm btn-secondary float-end btn-icon-comment" id="editCommentSubmitButton">
+					<fmt:message key="label.post" />
+				</button>
+				
+				<button type="button" onclick="javascript:cancelEdit();" class="btn btn-sm btn-secondary btn-icon-cancel float-end me-1">
+					<fmt:message key="label.cancel" />
+				</button>
+			</div>
+			
+			<%-- Post Anonymously? --%>
+			<c:if test="${sessionMap.anonymous}">
+				<c:set var="anonymousCheckboxChecked" value="${comment.comment.anonymous}"/>
+				<c:set var="anonymousCheckboxName" value="commentAnonymousEdit"/>
+				<%@include file="anonymouscheckbox.jsp"%>
+			</c:if>
+		</div>
+	</form>
 </div>
-
-
-
+</div>
+</div>
\ No newline at end of file
Index: lams_central/web/comments/msgview.jsp
===================================================================
diff -u -r4a671993d031537b4a1b749a1578e88afd7b9d25 -rf14a45648947b8813b4b99842665fcf87f5dfbed
--- lams_central/web/comments/msgview.jsp	(.../msgview.jsp)	(revision 4a671993d031537b4a1b749a1578e88afd7b9d25)
+++ lams_central/web/comments/msgview.jsp	(.../msgview.jsp)	(revision f14a45648947b8813b4b99842665fcf87f5dfbed)
@@ -1,181 +1,209 @@
 <%--  commentDto, commentUid, msgLevel needs to be in the session elsewhere --%>
 
-  <c:set var="hidden" value="${commentDto.comment.hideFlag}" />
-  <c:set var="anonymous" value="${commentDto.comment.anonymous}" />
-
-  <c:choose>
+ <c:set var="hidden" value="${commentDto.comment.hideFlag}" />
+ <c:set var="anonymous" value="${commentDto.comment.anonymous}" />
+ <c:choose>
     <c:when test='${(commentDto.level <= 1)}'>
-      <c:set var="indentSize" value="0" />
+    	<c:set var="indentSize" value="0" />
     </c:when>
     <c:otherwise>
-      <c:set var="indentSize" value="${(commentDto.level-1)*indent}" />
+    	<c:set var="indentSize" value="${(commentDto.level-1)*indent}" />
     </c:otherwise>
-  </c:choose>
-  <c:set var="paddingRightSize" value="${(commentDto.level-1)*indent+6}" />
-
-  <c:choose>
+ </c:choose>
+ <c:set var="paddingRightSize" value="${(commentDto.level-1)*indent+6}" />
+ <c:choose>
     <c:when test='${commentDto.comment.uid == commentUid}'>
-      <c:set var="highlightClass">highlight</c:set>
+     	<c:set var="highlightClass">highlight</c:set>
     </c:when>
     <c:otherwise>	
-      <c:set var="highlightClass"></c:set>
+    	<c:set var="highlightClass"></c:set>
     </c:otherwise> 
-  </c:choose>
+ </c:choose>
 
-  <div class="row">
-    <div class="col-xs-12" style="margin-left:${indentSize}px;padding-right:${paddingRightSize}px">
-      <div class="panel panel-default ${highlightClass} msg" id="msg${commentDto.comment.uid}">
-        <div class="panel-heading">
-          <h4 class="panel-title">
-          
-          	<%-- authors name --%>
-			<c:set var="msgAuthor" value="${commentDto.authorname}" />
-			<c:if test="${empty msgAuthor}">
-				<c:set var="msgAuthor">&nbsp;</c:set>
-			</c:if>
-			<c:choose>
-			<c:when test='${sessionMap.mode == "teacher"}'>
-				<c:choose>
-				<c:when test="${anonymous}">
-					<c:set var="author">${msgAuthor} (<fmt:message key="label.anonymous" />)</c:set>
-				</c:when>
-				<c:otherwise>
-					<c:set var="author">${msgAuthor}</c:set>
-				</c:otherwise>
-				</c:choose>
-			</c:when>
-			<c:otherwise>
-				<c:choose>
-				<c:when test="${hidden}">
-					<c:set var="author"></c:set>
-				</c:when>
-				<c:when test="${not hidden and anonymous}">
-					<c:set var="author"><fmt:message key="label.anonymous" /></c:set>
-				</c:when>
-				<c:otherwise>
-					<c:set var="author">${msgAuthor}</c:set>
-				</c:otherwise>
-				</c:choose>
-			</c:otherwise>
-			</c:choose>
+<div class="row">
+	<div class="col-12" style="margin-left:${indentSize}px;padding-right:${paddingRightSize}px">
+		<div class="card ${highlightClass} msg" id="msg${commentDto.comment.uid}">
+			<div class="card-header">
 
-          	<c:choose>
-            <c:when test="${isMonitor and isSticky}">
-				<c:set var="textClass" value="text-info"/>
-				<c:set var="bgClass" value="bg-info"/>
-				<i class="fa fa-thumb-tack ${textClass}"></i>
-            </c:when>
-            <c:when test="${isMonitor}">
-				<c:set var="textClass" value="text-info"/>
-				<c:set var="bgClass" value="bg-info"/>
-				<i class="fa fa-mortar-board ${textClass}"></i>
-            </c:when>
-            <c:when test="${isSticky}">
-				<c:set var="textClass" value="text-info"/>
-				<c:set var="bgClass" value=""/>
-				<i class="fa fa-thumb-tack ${textClass}"></i>
-            </c:when>
-            <c:otherwise>
-				<c:set var="textClass" value=""/>
-				<c:set var="bgClass" value=""/>
-				<i class="fa fa-user"></i> 
-			</c:otherwise>
-			</c:choose>            
+					<%-- authors name --%>
+					<c:set var="msgAuthor" value="${commentDto.authorname}" />
+					<c:if test="${empty msgAuthor}">
+						<c:set var="msgAuthor">&nbsp;</c:set>
+					</c:if>
+					<c:choose>
+						<c:when test='${sessionMap.mode == "teacher"}'>
+							<c:choose>
+								<c:when test="${anonymous}">
+									<c:set var="author">${msgAuthor} (<fmt:message key="label.anonymous" />)</c:set>
+								</c:when>
+								<c:otherwise>
+									<c:set var="author">${msgAuthor}</c:set>
+								</c:otherwise>
+							</c:choose>
+						</c:when>
+						<c:otherwise>
+							<c:choose>
+								<c:when test="${hidden}">
+									<c:set var="author"></c:set>
+								</c:when>
+								<c:when test="${not hidden and anonymous}">
+									<c:set var="author">
+										<fmt:message key="label.anonymous" />
+									</c:set>
+								</c:when>
+								<c:otherwise>
+									<c:set var="author">${msgAuthor}</c:set>
+								</c:otherwise>
+							</c:choose>
+						</c:otherwise>
+					</c:choose>
 
-            <span class="${textClass}"><strong><c:out value="${author}" escapeXml="true"/></strong> - 
-            <lams:Date value="${commentDto.comment.updated}" timeago="true"/>
-            <c:if test='${commentDto.comment.created != commentDto.comment.updated}'>
-              | <small>(<fmt:message key="label.edited"/>)</small>
-            </c:if>  
-            </span>         
-          </h4>
-        </div>
-        <div class="panel-body ${bgClass}" id="pb-msg${commentDto.comment.uid}">
-        
-        	  <c:if test='${(sessionMap.mode == "teacher") or not (anonymous or hidden)}'>
-	      <div class="pull-left roffset10"><lams:Portrait userId="${commentDto.authorUserId}"/></div>
-	      </c:if>
-	      
-          <c:if test='${(sessionMap.mode == "teacher") or (not hidden)}'>
-            <lams:out value="${commentDto.comment.body}" escapeHtml="true" />
-          </c:if>
-          <c:if test='${hidden}'>
-            <i><fmt:message key="label.hidden" /></i>
-          </c:if>
+					<c:choose>
+						<c:when test="${isMonitor and isSticky}">
+							<c:set var="textClass" value="text-info" />
+							<c:set var="bgClass" value="bg-info" />
+							<i class="fa fa-thumb-tack ${textClass}"></i>
+						</c:when>
+						<c:when test="${isMonitor}">
+							<c:set var="textClass" value="text-info" />
+							<c:set var="bgClass" value="bg-info" />
+							<i class="fa fa-mortar-board ${textClass}"></i>
+						</c:when>
+						<c:when test="${isSticky}">
+							<c:set var="textClass" value="text-info" />
+							<c:set var="bgClass" value="" />
+							<i class="fa fa-thumb-tack ${textClass}"></i>
+						</c:when>
+						<c:otherwise>
+							<c:set var="textClass" value="" />
+							<c:set var="bgClass" value="" />
+							<i class="fa fa-user"></i>
+						</c:otherwise>
+					</c:choose>
 
-          <hr class="msg-hr">
-          <div class="msg-footer">
+					<span class="${textClass}"><strong><c:out value="${author}" escapeXml="true" /></strong> - <lams:Date
+							value="${commentDto.comment.updated}" timeago="true"
+						/> 
+						<c:if test='${commentDto.comment.created != commentDto.comment.updated}'>
+              				| <small>(<fmt:message key="label.edited" />)</small>
+						</c:if> 
+					</span>
+			</div>
+			
+			<div class="card-body ${bgClass}" id="pb-msg${commentDto.comment.uid}">
 
-            <c:if test = '${not sessionMap.readOnly}'>
-              <c:set var="replytopic"><lams:LAMSURL />comments/newReplyTopic.do?sessionMapID=${sessionMapID}&parentUid=${commentDto.comment.uid}</c:set>
-              <a href="#nogo" onclick="javascript:createReply(${commentDto.comment.uid}, '${replytopic}');" class="comment">Reply</a>
-              &middot; 
-            </c:if>
+				<c:if test='${(sessionMap.mode == "teacher") or not (anonymous or hidden)}'>
+					<div class="float-start me-2">
+						<lams:Portrait userId="${commentDto.authorUserId}" />
+					</div>
+				</c:if>
 
-            <c:if test='${((sessionMap.mode == "teacher") || commentDto.author) && not sessionMap.readOnly }'>
-              <c:set var="edittopic"><lams:LAMSURL />comments/editTopic.do?sessionMapID=${sessionMapID}&commentUid=${commentDto.comment.uid}&create=${commentDto.comment.created.time}</c:set>
-              <a href="#nogo" onclick="javascript:createEdit(${commentDto.comment.uid}, '${edittopic}');" class="comment">Edit</a> 
-              &middot; 
-            </c:if>
+				<c:if test='${(sessionMap.mode == "teacher") or (not hidden)}'>
+					<lams:out value="${commentDto.comment.body}" escapeHtml="true" />
+				</c:if>
+				<c:if test='${hidden}'>
+					<i><fmt:message key="label.hidden" /></i>
+				</c:if>
 
-            <c:if test='${sessionMap.mode == "teacher" && not sessionMap.readOnly}'>
-              <!--  call the hide action -->
-              <c:choose>
-                <c:when test="${hidden}">
-                  <!--  display a show link  -->
-                  <c:set var="hideURL"><lams:LAMSURL />comments/hide.do?sessionMapID=${sessionMapID}&commentUid=${commentDto.comment.uid}&hideFlag=false</c:set>
-                  <a href="javascript:hideEntry(${commentDto.comment.uid}, '${hideURL}');" class="comment"><fmt:message key="label.show" /></a>
-                </c:when>
-                <c:otherwise>
-                  <!--  display a hide link -->
-                  <c:set var="hideURL"><lams:LAMSURL />comments/hide.do?sessionMapID=${sessionMapID}&commentUid=${commentDto.comment.uid}&hideFlag=true</c:set>
-                  <a href="javascript:hideEntry(${commentDto.comment.uid}, '${hideURL}');" class="comment"><fmt:message key="label.hide" /></a>
-                </c:otherwise>
-              </c:choose>
-              &middot; 
-            </c:if>
+				<hr class="msg-hr">
+				
+				<div class="float-end">
+					<c:if test='${sessionMap.mode == "teacher" && not sessionMap.readOnly}'>
+						<!--  call the hide action -->
+						<c:choose>
+							<c:when test="${hidden}">
+								<!--  display a show link  -->
+								<c:set var="hideURL">
+									<lams:LAMSURL />comments/hide.do?sessionMapID=${sessionMapID}&commentUid=${commentDto.comment.uid}&hideFlag=false
+								</c:set>
+								<button type="button" onclick="javascript:hideEntry(${commentDto.comment.uid}, '${hideURL}');" class="btn btn-sm btn-light comment">
+									<fmt:message key="label.show"/>
+								</button>
+							</c:when>
+							
+							<c:otherwise>
+								<!--  display a hide link -->
+								<c:set var="hideURL">
+									<lams:LAMSURL />comments/hide.do?sessionMapID=${sessionMapID}&commentUid=${commentDto.comment.uid}&hideFlag=true
+								</c:set>
+								<button type="button" onclick="javascript:hideEntry(${commentDto.comment.uid}, '${hideURL}');" class="btn btn-sm btn-light comment">
+									<fmt:message key="label.hide"/>
+								</button>
+							</c:otherwise>
+						</c:choose>
+             			 &middot; 
+           		 	</c:if>
 
-            <c:if test='${sessionMap.mode == "teacher" && not sessionMap.readOnly && commentDto.comment.commentLevel == 1}'>
-              <c:set var="makesticky"><lams:LAMSURL />comments/makeSticky.do?sessionMapID=${sessionMapID}&commentUid=${commentDto.comment.uid}&create=${commentDto.comment.created.time}&sticky=${!commentDto.comment.sticky}</c:set>
-              <a href="#nogo" onclick="javascript:makeSticky(${commentDto.comment.uid}, '${makesticky}');" class="comment">
-              	<fmt:message key="${commentDto.comment.sticky ? 'label.remove.sticky' : 'label.add.sticky' }"/></a> 
-              &middot; 
-            </c:if>
+					<c:if test='${sessionMap.mode == "teacher" && not sessionMap.readOnly && commentDto.comment.commentLevel == 1}'>
+						<c:set var="makesticky">
+							<lams:LAMSURL />comments/makeSticky.do?sessionMapID=${sessionMapID}&commentUid=${commentDto.comment.uid}&create=${commentDto.comment.created.time}&sticky=${!commentDto.comment.sticky}
+						</c:set>
+						<button type="button" onclick="javascript:makeSticky(${commentDto.comment.uid}, '${makesticky}');" class="btn btn-sm btn-light comment">
+							<fmt:message key="${commentDto.comment.sticky ? 'label.remove.sticky' : 'label.add.sticky' }" />
+						</button> 
+             			 &middot; 
+            		</c:if>
 
-            <span id="msglikeCount${commentDto.comment.uid}">${commentDto.comment.likeCount}</span> <fmt:message key="label.likes"/>
-            <c:if test = '${sessionMap.mode == "learner"}'>
-              <span id="msgvote${commentDto.comment.uid}">
-                <c:choose>
-                  <c:when test="${empty commentDto.comment.vote && not sessionMap.readOnly}">
-                    <span class="fa fa-thumbs-up fa-md fa-faded" title="<fmt:message key="label.like"/>"
-                          onclick="javascript:likeEntry(${commentDto.comment.uid});" id="msglikebutton${commentDto.comment.uid}"></span>
-                    <c:if test='${sessionMap.likeAndDislike}'> 
-                      &nbsp;<span class="fa fa-thumbs-down fa-md fa-flip-horizontal fa-faded" title="<fmt:message key="label.dislike"/>"
-                                  onclick="javascript:dislikeEntry(${commentDto.comment.uid});" id="msgdislikebutton${commentDto.comment.uid}"></span>
-                    </c:if>
-                  </c:when>
-                  <c:when test="${commentDto.comment.vote == 1}">
-                    <span class="fa fa-thumbs-o-up fa-md" title="<fmt:message key="label.like"/>"
-                          id="msglikebutton${commentDto.comment.uid}"/>
-                  </c:when>
-                  <c:otherwise>
-                    <c:if test='${sessionMap.likeAndDislike}'> 
-                      <span class="fa fa-thumbs-o-down fa-md fa-flip-horizontal" title="<fmt:message key="label.dislike"/>"
-                            id="msgdislikebutton${commentDto.comment.uid}"></span>
-                    </c:if>
-                  </c:otherwise>
-                </c:choose>
-              </span>
-            </c:if>          
+					<c:if test='${sessionMap.mode == "learner"}'>
+						<span id="msgvote${commentDto.comment.uid}"> 
+							<c:choose>
+								<c:when test="${empty commentDto.comment.vote && not sessionMap.readOnly}">
+									<button type="button" class="btn btn-light fa-regular fa-thumbs-up fa-md fa-faded" title="<fmt:message key="label.like"/>"
+										onclick="javascript:likeEntry(${commentDto.comment.uid});" id="msglikebutton${commentDto.comment.uid}"
+									></button>
+									
+									<c:if test='${sessionMap.likeAndDislike}'> 
+                      					<button type="button" class="btn btn-light fa-regular fa-thumbs-down fa-md fa-flip-horizontal fa-faded"
+											title="<fmt:message key="label.dislike"/>" onclick="javascript:dislikeEntry(${commentDto.comment.uid});"
+											id="msgdislikebutton${commentDto.comment.uid}"
+										></button>
+									</c:if>
+								</c:when>
+								
+								<c:when test="${commentDto.comment.vote == 1}">
+									<span class="btn btn-light disabled fa-solid fa-thumbs-up fa-md" title="<fmt:message key="label.like"/>"
+										id="msglikebutton${commentDto.comment.uid}"
+									/>
+								</c:when>
+								
+								<c:otherwise>
+									<c:if test='${sessionMap.likeAndDislike}'>
+										<span class="btn btn-light disabled fa-solid fa-thumbs-down fa-md fa-flip-horizontal" title="<fmt:message key="label.dislike"/>"
+											id="msgdislikebutton${commentDto.comment.uid}"
+										></span>
+									</c:if>
+								</c:otherwise>
+							</c:choose>
+						</span>
+					</c:if>
+					<span id="msglikeCount${commentDto.comment.uid}">${commentDto.comment.likeCount}</span>
+					<fmt:message key="label.likes" />
 
-          </div>          
+					<c:if test='${((sessionMap.mode == "teacher") || commentDto.author) && not sessionMap.readOnly }'>
+              			&middot;
+						<c:set var="edittopic">
+							<lams:LAMSURL />comments/editTopic.do?sessionMapID=${sessionMapID}&commentUid=${commentDto.comment.uid}&create=${commentDto.comment.created.time}
+						</c:set>
+						<button type="button" onclick="javascript:createEdit(${commentDto.comment.uid}, '${edittopic}');" class="btn btn-sm btn-light comment">
+							<i class="fa-regular fa-pen-to-square me-1"></i>
+							Edit
+						</button> 
+           			</c:if>
 
-        </div>
-  
-      </div>
+					<c:if test='${not sessionMap.readOnly}'>
+						&middot;
+						<c:set var="replytopic">
+							<lams:LAMSURL />comments/newReplyTopic.do?sessionMapID=${sessionMapID}&parentUid=${commentDto.comment.uid}
+						</c:set>
+						<button type="button" onclick="javascript:createReply(${commentDto.comment.uid}, '${replytopic}');" class="btn btn-sm btn-light comment">
+							<i class="fa-solid fa-reply me-1"></i>
+							Reply
+						</button> 
+           			 </c:if>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
 
-    </div>
 
-  </div>
-
-
Index: lams_central/web/comments/msgviewwrapper.jsp
===================================================================
diff -u -r4c2d1f37b92435907ec4ce23cb635a7cd9e4161e -rf14a45648947b8813b4b99842665fcf87f5dfbed
--- lams_central/web/comments/msgviewwrapper.jsp	(.../msgviewwrapper.jsp)	(revision 4c2d1f37b92435907ec4ce23cb635a7cd9e4161e)
+++ lams_central/web/comments/msgviewwrapper.jsp	(.../msgviewwrapper.jsp)	(revision f14a45648947b8813b4b99842665fcf87f5dfbed)
@@ -1,5 +1,7 @@
 <!DOCTYPE html>
 <%@ include file="/common/taglibs.jsp"%>
+<c:set var="isSticky" value="false"/> 
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 
 <%-- Wraps up msgview.jsp for returning a single message - called when an edit is performed. It needs to do all the setup that topicview.jsp normally does. --%>
 
@@ -9,20 +11,13 @@
 	$(".comment").click(function (e) {
 		e.stopPropagation();
 	});
+
+    jQuery(document).ready(function() {
+		jQuery("time.timeago").timeago();
+    });
 </script>
 
-<c:set var="isSticky" value="false"/> 
-
-<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 <c:forEach var="msgDto" items="${topicThread}">
-
 	<c:set var="msgLevel" value="${msgDto.level}" />
 	<%@ include file="msgview.jsp"%>
-
 </c:forEach>
-
-  <script type="text/javascript">
-    jQuery(document).ready(function() {
-      jQuery("time.timeago").timeago();
-    });
-  </script>
Fisheye: Tag f14a45648947b8813b4b99842665fcf87f5dfbed refers to a dead (removed) revision in file `lams_central/web/comments/new.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_central/web/comments/reply.jsp
===================================================================
diff -u -r3282e8325662ca873b88ceb07e627315d415a2c6 -rf14a45648947b8813b4b99842665fcf87f5dfbed
--- lams_central/web/comments/reply.jsp	(.../reply.jsp)	(revision 3282e8325662ca873b88ceb07e627315d415a2c6)
+++ lams_central/web/comments/reply.jsp	(.../reply.jsp)	(revision f14a45648947b8813b4b99842665fcf87f5dfbed)
@@ -1,5 +1,6 @@
 <%@ include file="/common/taglibs.jsp"%>
 <%@ page import="org.lamsfoundation.lams.comments.CommentConstants"%>
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 
 <script type="text/javascript">
 	// The treetable code uses the clicks to expand and collapse the replies but then 
@@ -51,7 +52,6 @@
 				reloadThread(
 					response,
 					'<lams:LAMSURL />',
-					false,
 					'<spring:escapeBody javaScriptEscape="true"><fmt:message key="error.cannot.redisplay.please.refresh"/></spring:escapeBody>',
 					'<spring:escapeBody javaScriptEscape="true"><fmt:message key="error.please.refresh"/></spring:escapeBody>'
 				);
@@ -68,43 +68,36 @@
 	}
 </script>
 
-<div class="comment-entry form-group voffset5">
-	<form id="replyForm" method="GET"
-		action="<lams:LAMSURL />comments/replyTopicInline.do">
-		<textarea class="form-control" id="replyFormBody"
-			maxlength="<%=CommentConstants.MAX_BODY_LENGTH + 2%>" name="body"
-			class="comment"></textarea>
-		<input type="hidden" id="sessionMapID" name="sessionMapID"
-			value="${sessionMapID}" /> <input type="hidden" id="parentUid"
-			name="parentUid" value="${parentUid}" />
+<div class="card lcard m-2">
+<div class="card-body">
+<div class="comment-entry form-group">
+	<form id="replyForm" method="GET" action="<lams:LAMSURL />comments/replyTopicInline.do">
+		<textarea class="form-control my-2" id="replyFormBody" maxlength="<%=CommentConstants.MAX_BODY_LENGTH + 2%>" name="body"
+			class="comment"
+		></textarea>
+		<input type="hidden" id="sessionMapID" name="sessionMapID" value="${sessionMapID}" /> 
+		<input type="hidden" id="parentUid" name="parentUid" value="${parentUid}" />
 
-		<div class="row voffset5">
-		<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+		<div class="mt-3">
+			<div class="clearfix">
+				<button type="button" onclick="javascript:replyFormSubmit();" class="btn btn-sm btn-secondary float-end btn-icon-comment" id="replyCommentSubmitButton">
+					<fmt:message key="label.post" />
+				</button>
+				
+				<button type="button" onclick="javascript:cancelReply();" class="btn btn-sm btn-secondary btn-icon-cancel float-end me-2">
+					<fmt:message key="label.cancel" />
+				</button>
+			</div>
 
-		<c:choose>
-	 	<c:when test="${sessionMap.anonymous}">
-	 	<%-- Post Anonymously? --%>
-		<div class="col-xs-12 col-sm-6">
-			<c:set var="anonymousCheckboxChecked" value=""/>
-			<c:set var="anonymousCheckboxName" value="commentAnonymousReply"/>
-			<%@include file="anonymouscheckbox.jsp" %>
-	 	</div>
-	
-		<%-- Cancel / Edit Buttons --%>
-		<div class="col-xs-12 col-sm-6">
-		</c:when>
-		<c:otherwise>
-		<div class="col-xs-12">
-		</c:otherwise>
-		</c:choose>
-		<a href="#nogo" onclick="javascript:replyFormSubmit();"
-			class="btn btn-xs btn-primary pull-right" id="replyCommentSubmitButton"> <fmt:message
-				key="label.post" />
-		</a>&nbsp; <a href="#nogo" onclick="javascript:cancelReply();"
-			class="btn btn-xs btn-primary pull-right roffset5"> <fmt:message
-				key="label.cancel" />
-		</a>
+			<%-- Post Anonymously? --%>
+			<c:if test="${sessionMap.anonymous}">
+				<c:set var="anonymousCheckboxChecked" value="" />
+				<c:set var="anonymousCheckboxName" value="commentAnonymousReply" />
+				<%@include file="anonymouscheckbox.jsp"%>
+			</c:if>
 		</div>
-	
+
 	</form>
 </div>
+</div>
+</div>
\ No newline at end of file
Index: lams_central/web/comments/topicview.jsp
===================================================================
diff -u -r3282e8325662ca873b88ceb07e627315d415a2c6 -rf14a45648947b8813b4b99842665fcf87f5dfbed
--- lams_central/web/comments/topicview.jsp	(.../topicview.jsp)	(revision 3282e8325662ca873b88ceb07e627315d415a2c6)
+++ lams_central/web/comments/topicview.jsp	(.../topicview.jsp)	(revision f14a45648947b8813b4b99842665fcf87f5dfbed)
@@ -1,36 +1,37 @@
 <%@ page import="org.lamsfoundation.lams.comments.CommentConstants"%>
-
 <c:set var="maxThreadUid" value="0"/>
 <c:set var="minThreadLike" value="-1"/>
 <c:set var="messageTablename" value=""/>
-<c:set var="indent" value="10"/>
-
+<c:set var="indent" value="20"/>
 <c:set var="show"><spring:escapeBody javaScriptEscape="true"><fmt:message key="label.show" /></spring:escapeBody></c:set>
 <c:set var="hide"><spring:escapeBody javaScriptEscape="true"><fmt:message key="label.hide" /></spring:escapeBody></c:set>
 <c:set var="prompt"><spring:escapeBody javaScriptEscape="true"><fmt:message key="label.showhide.prompt" /></spring:escapeBody></c:set>
 <c:set var="tableCommand">expandable:true,initialState:'expanded',
-	expanderTemplate:'<a href=\"#\"><span style="margin-left:20px">${prompt}</span></a>',
-	stringCollapse:'${hide}',stringExpand:'${show}',
-	clickableNodeNames:true,indent:${indent},
+	expanderTemplate:'<button type="button" class="btn btn-sm btn-light text-nowrap my-2 py-0 px-1 ms-2"><span style="margin-left:20px">${prompt}</span></button>',
+	stringCollapse:'${hide}',
+	stringExpand:'${show}',
+	clickableNodeNames:false,
+	indent:${indent},
 	onNodeInitialized:function() {
 		if (this.level() >= 2) {
 			this.collapse();
 		}
 	}
- </c:set>
+</c:set>
 <c:set var="tableCommandSticky">expandable:true,initialState:'collapsed',
-	expanderTemplate:'<a href=\"#\"><span style="margin-left:20px">${prompt}</span></a>',
-	stringCollapse:'${hide}',stringExpand:'${show}',
-	clickableNodeNames:true,indent:${indent},
+	expanderTemplate:'<button type="button" class="btn btn-sm btn-light text-nowrap my-2 py-0 px-1 ms-2"><span style="margin-left:20px">${prompt}</span></a>',
+	stringCollapse:'${hide}',
+	stringExpand:'${show}',
+	clickableNodeNames:false,
+	indent:${indent},
 	onNodeInitialized:function() {
 		if (this.level() >= 2) {
 			this.collapse();
 		}
-	}
- </c:set>
+	} 
+</c:set>
 
 <script type="text/javascript">
-
 	// The treetable code uses the clicks to expand and collapse the replies but then 
 	// the buttons will not work. So stop the event propogating up the event chain. 
 	$(".button").click(function (e) {
@@ -40,14 +41,14 @@
 		e.stopPropagation();
 	});
 	
-	
 	function createReply(commentUid, url) {
 		if ( document.getElementById('reply') ) {
 			alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="message.complete.or.cancel.reply"/></spring:escapeBody>');
 		} else {
 			// set up the new reply area
 			var replyDiv = document.createElement("div");
 			replyDiv.id = 'reply';
+			replyDiv.className = 'pt-5 clearfix';
 
 			var parentDiv = document.getElementById('pb-msg'+commentUid);
 			parentDiv.appendChild(replyDiv);
@@ -57,7 +58,6 @@
 		}
 	}
 	
-	
 	function createEdit(commentUid, url) {
 		if ( document.getElementById('edit') ) {
 			alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="message.complete.or.cancel.edit"/></spring:escapeBody>');
@@ -66,6 +66,7 @@
 			// set up the new reply area
 			var editDiv = document.createElement("div");
 			editDiv.id = 'edit';
+			editDiv.className = 'pt-5 clearfix';
 
 			var parentDiv = document.getElementById('pb-msg'+commentUid);
 			parentDiv.appendChild(editDiv);
@@ -75,14 +76,13 @@
 		}
 	}
 
-	
 	function hideEntry(commentUid, url) {
 		$.ajax({ // create an AJAX call...
 		    type: 'GET', 
 		    url: url
 		})
 	    .done(function (response) {
-			reloadThread(response, '<lams:LAMSURL />',false,'<fmt:message key="error.cannot.redisplay.please.refresh"/>','<fmt:message key="error.please.refresh"/>');
+			reloadThread(response, '<lams:LAMSURL />','<fmt:message key="error.cannot.redisplay.please.refresh"/>','<fmt:message key="error.please.refresh"/>');
 	    });
 	}
 
@@ -94,7 +94,7 @@
 	    .done(function (response) {
 	    	refreshComments
 	    	
-			reloadThread(response, '<lams:LAMSURL />',false,'<fmt:message key="error.cannot.redisplay.please.refresh"/>','<fmt:message key="error.please.refresh"/>');
+			reloadThread(response, '<lams:LAMSURL />','<fmt:message key="error.cannot.redisplay.please.refresh"/>','<fmt:message key="error.please.refresh"/>');
 	    });
 	}
 
@@ -122,30 +122,34 @@
 			'<lams:LAMSURL />comments/like.do?sessionMapID=${sessionMapID}&commentUid='+commentUid,
 			1
 		);		
-		$( '#msglikebutton'+commentUid ).removeClass( 'fa-thumbs-up fa-faded' ).addClass( 'fa-thumbs-o-up' );
+		$( '#msglikebutton'+commentUid ).removeClass( 'fa-regular fa-faded' ).addClass( 'fa-solid' );
 		$( '#msglikebutton'+commentUid ).prop( 'onclick', null );
+		
 		<c:if test='${sessionMap.likeAndDislike}'> 
-		$( '#msgdislikebutton'+commentUid ).css( "display", "none" );
+			$( '#msgdislikebutton'+commentUid ).css( "display", "none" );
 		</c:if>
 	}
 
 	<c:if test='${sessionMap.likeAndDislike}'> 
-	function dislikeEntry(commentUid) {
-		updateLike(
-			commentUid, 
-			'<lams:LAMSURL />comments/dislike.do?sessionMapID=${sessionMapID}&commentUid='+commentUid,
-			-1
-		);		
-		$( '#msgdislikebutton'+commentUid ).removeClass( 'fa-thumbs-down fa-faded' ).addClass( 'fa-thumbs-o-down' );
-		$( '#msgdislikebutton'+commentUid ).prop( 'onclick', null );
-		$( '#msglikebutton'+commentUid ).css( "display", "none" );
-	}
+		function dislikeEntry(commentUid) {
+			updateLike(
+				commentUid, 
+				'<lams:LAMSURL />comments/dislike.do?sessionMapID=${sessionMapID}&commentUid='+commentUid,
+				-1
+			);		
+			$( '#msgdislikebutton'+commentUid ).removeClass( 'fa-regular fa-faded' ).addClass( 'fa-solid' );
+			$( '#msgdislikebutton'+commentUid ).prop( 'onclick', null );
+			$( '#msglikebutton'+commentUid ).css( "display", "none" );
+		}
 	</c:if>
 
+
+    jQuery(document).ready(function() {
+		jQuery("time.timeago").timeago();
+    });
 </script>
 
 <c:set var="isSticky" value="false"/>
-
 <c:forEach var="commentDto" items="${commentThread}">
 	<c:set var="msgLevel" value="${commentDto.level}" />
 	<c:set var="hidden" value="${commentDto.comment.hideFlag}" />
@@ -171,7 +175,7 @@
 		</c:if>
 		<c:set var="messageTablename" value="tree${commentDto.comment.uid}"/>
 		<div id="thread${commentDto.comment.uid}" class="clearfix">
-		<table id="${messageTablename}" class="col-xs-12">
+		<table id="${messageTablename}" class="col-12">
 		<tr data-tt-id="${commentDto.comment.uid}"><td>	
 	</c:when>
 	<c:otherwise>
@@ -187,24 +191,29 @@
 
 </c:forEach>
 
-	<c:if test='${messageTablename != ""}'>
-		</table>
-		<script>
-			$("#${messageTablename}").treetable({${isSticky?tableCommandSticky:tableCommand}});
-		</script>	
-		</div>
-	</c:if>
+<c:if test='${messageTablename != ""}'>
+	</table>
+	<script>
+		$("#${messageTablename}").treetable({${isSticky?tableCommandSticky:tableCommand}});
+	</script>	
+	</div>
+</c:if>
 
 <c:if test='${maxThreadUid > 0 && ! noMorePages}'>
+	<div class="text-center d-none">
+		<c:set var="more">
+			<lams:LAMSURL />/comments/viewTopic.do?pageLastId=${maxThreadUid}&likeCount=${minThreadLike}&pageSize=${sessionMap.pageSize}&sessionMapID=${sessionMapID}
+		</c:set>
+		<a href="<c:out value="${more}"/>" class="btn btn-sm btn-light">
+			<fmt:message key="label.show.more.messages" />
+		</a>
+	</div>
+	
 	<div class="text-center">
-	<c:set var="more"><lams:LAMSURL />/comments/viewTopic.do?pageLastId=${maxThreadUid}&likeCount=${minThreadLike}&pageSize=${sessionMap.pageSize}&sessionMapID=${sessionMapID}</c:set>
-	<a href="<c:out value="${more}"/>" class="btn btn-xs btn-default"><fmt:message key="label.show.more.messages" /></a>
+		<button type="button" onclick="javascript:refreshComments();" class="btn btn-light btn-sm btn-icon-refresh"> 
+			<fmt:message key="label.refresh"/>
+		</button>
 	</div>
 </c:if>
 
-  <script type="text/javascript">
-    jQuery(document).ready(function() {
-      jQuery("time.timeago").timeago();
-    });
-  </script>
-
+					
Index: lams_central/web/comments/topicviewwrapper.jsp
===================================================================
diff -u -r4c2d1f37b92435907ec4ce23cb635a7cd9e4161e -rf14a45648947b8813b4b99842665fcf87f5dfbed
--- lams_central/web/comments/topicviewwrapper.jsp	(.../topicviewwrapper.jsp)	(revision 4c2d1f37b92435907ec4ce23cb635a7cd9e4161e)
+++ lams_central/web/comments/topicviewwrapper.jsp	(.../topicviewwrapper.jsp)	(revision f14a45648947b8813b4b99842665fcf87f5dfbed)
@@ -1,15 +1,12 @@
 <!DOCTYPE html>
 <%@ include file="/common/taglibs.jsp"%>
+<c:set var="lams"><lams:LAMSURL /></c:set>
+<c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request" />
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 
 <!-- Wraps up topicview.jsp for paging. The first batch of messages is in viewtopic.jsp then the rest are loaded via scrolling using this jsp. -->
 
-<c:set var="lams">
-	<lams:LAMSURL />
-</c:set>
-<c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request" />
-<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 <script type="text/javascript" src="${lams}includes/javascript/jquery.treetable.js"></script>
-
 <%@ include file="topicview.jsp"%>
 
 
Fisheye: Tag f14a45648947b8813b4b99842665fcf87f5dfbed refers to a dead (removed) revision in file `lams_central/web/comments5/allview.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag f14a45648947b8813b4b99842665fcf87f5dfbed refers to a dead (removed) revision in file `lams_central/web/comments5/allviewwrapper.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag f14a45648947b8813b4b99842665fcf87f5dfbed refers to a dead (removed) revision in file `lams_central/web/comments5/anonymouscheckbox.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag f14a45648947b8813b4b99842665fcf87f5dfbed refers to a dead (removed) revision in file `lams_central/web/comments5/comments.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag f14a45648947b8813b4b99842665fcf87f5dfbed refers to a dead (removed) revision in file `lams_central/web/comments5/edit.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag f14a45648947b8813b4b99842665fcf87f5dfbed refers to a dead (removed) revision in file `lams_central/web/comments5/msgview.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag f14a45648947b8813b4b99842665fcf87f5dfbed refers to a dead (removed) revision in file `lams_central/web/comments5/msgviewwrapper.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag f14a45648947b8813b4b99842665fcf87f5dfbed refers to a dead (removed) revision in file `lams_central/web/comments5/reply.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag f14a45648947b8813b4b99842665fcf87f5dfbed refers to a dead (removed) revision in file `lams_central/web/comments5/topicview.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag f14a45648947b8813b4b99842665fcf87f5dfbed refers to a dead (removed) revision in file `lams_central/web/comments5/topicviewwrapper.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_central/web/includes/javascript/comments.js
===================================================================
diff -u -r3282e8325662ca873b88ceb07e627315d415a2c6 -rf14a45648947b8813b4b99842665fcf87f5dfbed
--- lams_central/web/includes/javascript/comments.js	(.../comments.js)	(revision 3282e8325662ca873b88ceb07e627315d415a2c6)
+++ lams_central/web/includes/javascript/comments.js	(.../comments.js)	(revision f14a45648947b8813b4b99842665fcf87f5dfbed)
@@ -15,7 +15,7 @@
 	}
 
 	
-	function reloadThread(response, lamsUrl, newUi, savedCannotRedisplayMessage, errorCannotRedisplayMessage) {
+	function reloadThread(response, lamsUrl, savedCannotRedisplayMessage, errorCannotRedisplayMessage) {
 	    var threadDiv = document.getElementById('thread'+response.threadUid);
        	var threadUid = response.threadUid;
        	var commentUid = response.commentUid;
@@ -24,7 +24,7 @@
         	if ( ! threadDiv) {
         		alert(savedCannotRedisplayMessage);
        		} else {
-    			var loadString = lamsUrl+"comments/viewTopicThread.do?newUI=" + newUi + "&sessionMapID=" + response.sessionMapID + "&threadUid=" + threadUid+"&commentUid="+commentUid;
+    			var loadString = lamsUrl+"comments/viewTopicThread.do?sessionMapID=" + response.sessionMapID + "&threadUid=" + threadUid+"&commentUid="+commentUid;
     			$.ajaxSetup({ cache: true });
 				$(threadDiv).load(loadString, function() {
 					// expand up to the reply - in case it is buried down in a lot of replies