Index: lams_central/web/comments5/reply.jsp
===================================================================
diff -u -r3282e8325662ca873b88ceb07e627315d415a2c6 -r793d3319ee7d2aa94af0559c0ee64c08ea6a4581
--- lams_central/web/comments5/reply.jsp	(.../reply.jsp)	(revision 3282e8325662ca873b88ceb07e627315d415a2c6)
+++ lams_central/web/comments5/reply.jsp	(.../reply.jsp)	(revision 793d3319ee7d2aa94af0559c0ee64c08ea6a4581)
@@ -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 
@@ -68,7 +69,9 @@
 	}
 </script>
 
-<div class="comment-entry form-group mt-1">
+<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"
@@ -77,36 +80,26 @@
 		<input type="hidden" id="parentUid" name="parentUid" value="${parentUid}" />
 		<input type="hidden" name="newUI" value="true" />
 
-		<div class="row mt-1">
-			<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-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-12 col-sm-6">
-				</c:when>
-				<c:otherwise>
-					<div class="col-12">
-				</c:otherwise>
-			</c:choose>
-
-			<button type="button" onclick="javascript:replyFormSubmit();" class="btn btn-sm btn-secondary float-end" id="replyCommentSubmitButton">
-				<i class="fa fa-comment me-1"></i>
-				<fmt:message key="label.post" />
-			</button>
-			&nbsp;
-			<button type="button" onclick="javascript:cancelReply();" class="btn btn-sm btn-secondary float-end me-1">
-				<i class="fa fa-cancel me-1"></i>
-				<fmt:message key="label.cancel" />
-			</button>
+			<%-- 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