Index: lams_central/web/WEB-INF/tags/Alert5.tag
===================================================================
diff -u -r56ec8d9806c22331d9483e197f0e270b638471be -r8121ab6e6a1166176a6c77a34a4eeee03ff0787c
--- lams_central/web/WEB-INF/tags/Alert5.tag	(.../Alert5.tag)	(revision 56ec8d9806c22331d9483e197f0e270b638471be)
+++ lams_central/web/WEB-INF/tags/Alert5.tag	(.../Alert5.tag)	(revision 8121ab6e6a1166176a6c77a34a4eeee03ff0787c)
@@ -32,8 +32,8 @@
 	</c:when>
 </c:choose>
 
-<div class="row justify-content-md-center">
-	<div class="col-md-auto">
+<div class="row justify-content-md-center text-center">
+	<div class="col-md-auto" style="min-width: 33%;">
 		<div id="${idName}" class="alert alert-${alertType} shadow" role="alert">
 			<c:if test="${close}">
 				<button type="button" class="btn-close btn-sm float-end ms-4" data-bs-dismiss="alert" aria-label="Close"></button>
Index: lams_central/web/WEB-INF/tags/NotebookReedit.tag
===================================================================
diff -u -rc3888371ef51396eac033e0617292dc5a07af6aa -r8121ab6e6a1166176a6c77a34a4eeee03ff0787c
--- lams_central/web/WEB-INF/tags/NotebookReedit.tag	(.../NotebookReedit.tag)	(revision c3888371ef51396eac033e0617292dc5a07af6aa)
+++ lams_central/web/WEB-INF/tags/NotebookReedit.tag	(.../NotebookReedit.tag)	(revision 8121ab6e6a1166176a6c77a34a4eeee03ff0787c)
@@ -34,26 +34,23 @@
 	</div>
 
 	<div class="card-body">
-		<div class="m-2">
+		<div class="instructions">
 			<lams:out value="${reflectInstructions}" escapeHtml="true" />
 		</div>
-		<hr />
 
-		<div class="m-2">
-			<p>
-				<c:choose>
-					<c:when test="${empty reflectEntry}">
-						<em><fmt:message key="${noReflectionLabelKey}" /></em>
-					</c:when>
-					<c:otherwise>
-						<lams:out value="${reflectEntry}" escapeHtml="true" />
-					</c:otherwise>
-				</c:choose>
-			</p>
+		<div>
+			<c:choose>
+				<c:when test="${empty reflectEntry}">
+					<em><fmt:message key="${noReflectionLabelKey}" /></em>
+				</c:when>
+				<c:otherwise>
+					<lams:out value="${reflectEntry}" escapeHtml="true" />
+				</c:otherwise>
+			</c:choose>
 
 			<c:if test="${isEditButtonEnabled}">
-				<div class="mt-2 float-end">
-					<button name="editNotebookButton" id="edit-notebook-button" class="btn btn-sm btn-secondary btn-disable-on-submit btn-icon-pen" type="button"
+				<div class="mt-4 float-end">
+					<button type="button" name="editNotebookButton" id="edit-notebook-button" class="btn btn-sm btn-light btn-disable-on-submit btn-icon-pen"
 						onclick="continueReflect()">
 						<fmt:message key="${editNotebookLabelKey}" />
 					</button>
Index: lams_central/web/WEB-INF/tags/Rating5.tag
===================================================================
diff -u -r8de3eaa9202afa22c16447d5236943cbe4749eb1 -r8121ab6e6a1166176a6c77a34a4eeee03ff0787c
--- lams_central/web/WEB-INF/tags/Rating5.tag	(.../Rating5.tag)	(revision 8de3eaa9202afa22c16447d5236943cbe4749eb1)
+++ lams_central/web/WEB-INF/tags/Rating5.tag	(.../Rating5.tag)	(revision 8121ab6e6a1166176a6c77a34a4eeee03ff0787c)
@@ -156,14 +156,11 @@
 						</fmt:param>
 					</fmt:message>
 				</div>
-				
 			</c:otherwise>
 		</c:choose>
 			
 	</c:forEach>
-
 </div>
-
 </div>
 
 <%--Comments area---------------------------------------%>
@@ -189,35 +186,32 @@
 			
 					<!-- Comment min words limit -->
 					<c:if test="${itemRatingDto.commentsMinWordsLimit ne 0}">
-					
 						<lams:Alert5 type="info" id="comment-limit-${itemRatingDto.itemId}" close="false">
 							<fmt:message key="${minNumberWordsLabel}">
 								: <fmt:param value="${itemRatingDto.commentsMinWordsLimit}"/>
 							</fmt:message>
 						</lams:Alert5>
 					</c:if>
 				
-					<div class="row">
-						<div class="col-12 col-sm-11">
+					<div class="d-flex align-items-center">
+						<div class="flex-grow-1">
 							<textarea name="comment" rows="2" id="comment-textarea-${itemRatingDto.itemId}" class="form-control comment-textarea"
 									placeholder="<fmt:message key="label.comment.textarea.tip"/>"
 									aria-label="<fmt:message key="label.comment.textarea.tip"/>"></textarea>
 						</div>
-						<div class="col-12 col-sm-1 p-0">
-							<button class="btn btn-success btn-sm add-comment add-comment-new"
+						<div>
+							<button class="btn btn-secondary btn-sm add-comment add-comment-new ms-2"
 									data-item-id="${itemRatingDto.itemId}"
 									data-comment-criteria-id="${itemRatingDto.commentsCriteriaId}"
 									data-show-all-comments="${showAllComments}"
 									data-refresh-on-submit="${refreshOnComment}"
 									aria-label="<fmt:message key="${postCommentButtonLabel}"/>">
-								<i class="fa fa-check fa-lg"></i>
+								<i class="fa-solid fa-paper-plane"></i>
 							</button>
 						</div>
 					</div>
-						
 				</div>			
 			</c:when>
 		</c:choose>
-			
 	</div>	
-</c:if>
\ No newline at end of file
+</c:if>
Index: lams_central/web/comments5/msgview.jsp
===================================================================
diff -u -r793d3319ee7d2aa94af0559c0ee64c08ea6a4581 -r8121ab6e6a1166176a6c77a34a4eeee03ff0787c
--- lams_central/web/comments5/msgview.jsp	(.../msgview.jsp)	(revision 793d3319ee7d2aa94af0559c0ee64c08ea6a4581)
+++ lams_central/web/comments5/msgview.jsp	(.../msgview.jsp)	(revision 8121ab6e6a1166176a6c77a34a4eeee03ff0787c)
@@ -106,27 +106,8 @@
 				</c:if>
 
 				<hr class="msg-hr">
+				
 				<div class="float-end">
-					<c:if test='${not sessionMap.readOnly}'>
-						<c:set var="replytopic">
-							<lams:LAMSURL />comments/newReplyTopic.do?newUI=true&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">
-							Reply
-						</button>
-             			 &middot; 
-           			 </c:if>
-
-					<c:if test='${((sessionMap.mode == "teacher") || commentDto.author) && not sessionMap.readOnly }'>
-						<c:set var="edittopic">
-							<lams:LAMSURL />comments/editTopic.do?newUI=true&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">
-							Edit
-						</button>
-              			&middot; 
-           			</c:if>
-
 					<c:if test='${sessionMap.mode == "teacher" && not sessionMap.readOnly}'>
 						<!--  call the hide action -->
 						<c:choose>
@@ -163,41 +144,62 @@
              			 &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}">
-									<button type="button" class="btn fa-regular fa-thumbs-up fa-md fa-faded" title="<fmt:message key="label.like"/>"
+									<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 fa-regular fa-thumbs-down fa-md fa-flip-horizontal fa-faded"
+                      					<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="fa-solid fa-thumbs-up fa-md" title="<fmt:message key="label.like"/>"
+									<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="fa-solid fa-thumbs-down fa-md fa-flip-horizontal" title="<fmt:message key="label.dislike"/>"
+										<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" />
 
+					<c:if test='${((sessionMap.mode == "teacher") || commentDto.author) && not sessionMap.readOnly }'>
+              			&middot;
+						<c:set var="edittopic">
+							<lams:LAMSURL />comments/editTopic.do?newUI=true&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>
+
+					<c:if test='${not sessionMap.readOnly}'>
+						&middot;
+						<c:set var="replytopic">
+							<lams:LAMSURL />comments/newReplyTopic.do?newUI=true&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>
Index: lams_central/web/css/_jquery.jRating_base.scss
===================================================================
diff -u -r8de3eaa9202afa22c16447d5236943cbe4749eb1 -r8121ab6e6a1166176a6c77a34a4eeee03ff0787c
--- lams_central/web/css/_jquery.jRating_base.scss	(.../_jquery.jRating_base.scss)	(revision 8de3eaa9202afa22c16447d5236943cbe4749eb1)
+++ lams_central/web/css/_jquery.jRating_base.scss	(.../_jquery.jRating_base.scss)	(revision 8121ab6e6a1166176a6c77a34a4eeee03ff0787c)
@@ -60,13 +60,8 @@
 .rating-stars-caption {padding-top: 6px; font-size: 12px}
 .rating-stars, .rating-stars-disabled {margin: 0px auto; min-height: 20px;}
 
-.add-comment {
-	margin-top: 30px;
-}
-
 .rating-comment {
 	padding: 15px;
-	width: 80%;
 	margin: 15px auto;
 }
 
Index: lams_central/web/css/components.scss
===================================================================
diff -u -r793d3319ee7d2aa94af0559c0ee64c08ea6a4581 -r8121ab6e6a1166176a6c77a34a4eeee03ff0787c
--- lams_central/web/css/components.scss	(.../components.scss)	(revision 793d3319ee7d2aa94af0559c0ee64c08ea6a4581)
+++ lams_central/web/css/components.scss	(.../components.scss)	(revision 8121ab6e6a1166176a6c77a34a4eeee03ff0787c)
@@ -287,13 +287,13 @@
 	color: #555;
 	background-color: var(--bs-white);
 	background-image: none;
-	border-radius: 4px;
+	border-radius: 0.375rem; /* from .form-control */
 	-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
 	box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
 	-webkit-transition: border-color ease-in-out 0.15s, -webkit-box-shadow ease-in-out 0.15s;
 	-o-transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s;
 	transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s;
-	border: thin solid var(--bs-secondary);
+	border: 1px solid #ced4da; /* from .form-control */
 	overflow: hidden;
 	/* keeps floating objects within ckeditor area */
 	/* LAMS -  min height is set in ckconfig_custom.js but keep the default here too so that most fields
@@ -558,6 +558,7 @@
 	border-radius: 1rem;
 	border: 0;
 }
+/*---------- .ltable ----------------*/ 
 
 .ltable {
 	margin-bottom: 1rem;	
@@ -568,21 +569,30 @@
     font-style: italic;
     color: initial !important;
 }
-.ltable>.row {
+.ltable>div {
 	border-bottom: 2px solid var(--bs-gray-200);
 	padding: 0.5rem;
 	margin-left: 0;
 	margin-right: 0;
 }
-.ltable.table-sm>.row {
+
+.ltable.table-sm>div {
 	padding: 0.25rem;
 }
-.ltable.table-striped {
+
+.ltable.table-striped.no-header {
    > div:nth-of-type(odd) {
     background-color: var(--bs-gray-200);
   }
 }
-.ltable.table-hover>div:not(:first-child):hover{
+.ltable.table-striped:not(.no-header) {
+   > div:not(:first-child):nth-of-type(even) {
+    background-color: var(--bs-gray-200);
+  }
+}
+
+.ltable.table-hover > div:not(:first-child):hover,
+.ltable.table-hover.no-header > div:first-child:hover{
 	background-color: var(--bs-gray-200);
 }
 
@@ -619,6 +629,7 @@
 .rating-comment{
 	background-image: none;
 	border: $border-thin-default-light;
+	border-radius: 0.375rem; /* from .form-control */
 }
 
 .rating-comment-posted-by{
@@ -645,41 +656,78 @@
 
 /*----------buttons with icons ----------------*/ 
 
-.na, .btn-icon-refresh, .btn-icon-pen, .btn-icon-return, .btn-icon-previous, .btn-icon-next, .btn-icon-comment, .btn-icon-cancel {
+.btn-icon-add,
+.btn-icon-cancel,
+.btn-icon-comment,
+.btn-icon-next,
+.btn-icon-pen,
+.btn-icon-previous,
+.btn-icon-refresh,
+.btn-icon-remove,
+.btn-icon-return,
+na {
 	display: inline-block;
 }
-.na:after, .btn-icon-refresh:before, .btn-icon-pen:before, .btn-icon-return:before, .btn-icon-previous:before, .btn-icon-next:after, .btn-icon-comment:after, .btn-icon-cancel:before {
-	font-family: FontAwesome;
+.btn-icon-add:before,
+.btn-icon-cancel:before,
+.btn-icon-comment:after,
+.btn-icon-next:after,
+.btn-icon-previous:before,
+.btn-icon-pen:before,
+.btn-icon-refresh:before,
+.btn-icon-remove:before,
+.btn-icon-return:before,
+.na:after {	font-family: FontAwesome;
 	font-style: normal;
 	font-weight: normal;
 	text-decoration: inherit;
-	margin-left: 0.25rem;
 	color: inherit;
 }
+.btn-icon-comment:after,
+.btn-icon-next:after,
 .na:after {
-	content: "\f0a9";
+	margin-left: 0.25rem;
 }
-.btn-icon-refresh:before {
-	content: "\f021";
+.btn-icon-add:before,
+.btn-icon-cancel:before,
+.btn-icon-previous:before,
+.btn-icon-pen:before,
+.btn-icon-refresh:before,
+.btn-icon-remove:before,
+.btn-icon-return:before {
+	margin-right: 0.25rem;
 }
+
+.btn-icon-add:before {
+	content: "\2b";
+}
+.btn-icon-cancel:before {
+	content: "\f05e";
+}
+.btn-icon-comment:after {
+	content: "\f1d8";
+}
+.btn-icon-next:after {
+	content: "\f101";
+}
 .btn-icon-pen:before {
 	content: "\f044";
 }
-.btn-icon-return:before {
-	content: "\f2ea";
-}
 .btn-icon-previous:before {
 	content: "\f100";
 }
-.btn-icon-next:after {
-	content: "\f101";
+.btn-icon-refresh:before {
+	content: "\f021";
 }
-.btn-icon-comment:after {
-	content: "\f1d8";
+.btn-icon-remove:before {
+	content: "\f1f8";
 }
-.btn-icon-cancel:before {
-	content: "\f05e";
+.btn-icon-return:before {
+	content: "\f2ea";
 }
+.na:after {
+	content: "\f0a9";
+}
 
 /*----------slider----------------*/
 
Index: lams_central/web/css/defaultHTML_jquery.jRating.scss
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r8121ab6e6a1166176a6c77a34a4eeee03ff0787c
--- lams_central/web/css/defaultHTML_jquery.jRating.scss	(.../defaultHTML_jquery.jRating.scss)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/css/defaultHTML_jquery.jRating.scss	(.../defaultHTML_jquery.jRating.scss)	(revision 8121ab6e6a1166176a6c77a34a4eeee03ff0787c)
@@ -1,2 +1,2 @@
 @import "_lams_variables.scss";
-@import "_jquery.jRating_base.scss";
+@import "_jquery.jRating_base.scss";
\ No newline at end of file
Index: lams_central/web/includes/javascript/portrait5.js
===================================================================
diff -u -rf11663c9b27c276fae910e6c3fa5561a3e2af781 -r8121ab6e6a1166176a6c77a34a4eeee03ff0787c
--- lams_central/web/includes/javascript/portrait5.js	(.../portrait5.js)	(revision f11663c9b27c276fae910e6c3fa5561a3e2af781)
+++ lams_central/web/includes/javascript/portrait5.js	(.../portrait5.js)	(revision 8121ab6e6a1166176a6c77a34a4eeee03ff0787c)
@@ -63,14 +63,15 @@
 
 // define a small header with the portrait and two lines of text next to portrait
 function definePortraitMiniHeader(portraitId, userId, LAMS_URL, line1, line2, portraitOnRight, otherClasses) {
-	var html = '<div';
-	if ( otherClasses )
-		html += ' class="' + otherClasses + '"';
-	html += '>';
-	html += definePortrait(portraitId, userId, "small", true, LAMS_URL, portraitOnRight ? "pull-right" : "pull-left roffset5");
-	html += '<span>' + line1 + '</span>';
-	html += '<br/><span style="font-size: smaller">' + line2 + '</span>';
-	html += '</div>';
+	var html = 
+			'<div' + (otherClasses ? ' class="' + otherClasses + '"' : '') + '>' +
+				'<div class="float-start me-2">' +
+			 		definePortrait(portraitId, userId, "small", true, LAMS_URL, portraitOnRight ? "pull-right" : "pull-left roffset5") +
+			 	'</div>' +
+				'<span>' + line1 + '</span>' +
+				'<br/>' + 
+				'<span style="font-size: smaller">' + line2 + '</span>' +
+			'</div>';
 	return html;
 }
 
Index: lams_tool_assessment/web/pages/learning/results/attemptsummary.jsp
===================================================================
diff -u -r6866da235d682d74f883afdd01e00e92d16a13eb -r8121ab6e6a1166176a6c77a34a4eeee03ff0787c
--- lams_tool_assessment/web/pages/learning/results/attemptsummary.jsp	(.../attemptsummary.jsp)	(revision 6866da235d682d74f883afdd01e00e92d16a13eb)
+++ lams_tool_assessment/web/pages/learning/results/attemptsummary.jsp	(.../attemptsummary.jsp)	(revision 8121ab6e6a1166176a6c77a34a4eeee03ff0787c)
@@ -1,4 +1,4 @@
-<div id="attempt-summary" class="alert alert-success shadow mx-auto col-sm-8">
+<div id="attempt-summary" class="alert alert-success shadow mx-auto col-sm-8 ltable no-header table-hover">
 	<div class="row">
 		<div class="col-sm-5">
 			<fmt:message key="label.learning.summary.started.on" />
Index: lams_tool_forum/web/jsps/learning/viewforum.jsp
===================================================================
diff -u -re8e86d379857a349822a501189888545e69e56ac -r8121ab6e6a1166176a6c77a34a4eeee03ff0787c
--- lams_tool_forum/web/jsps/learning/viewforum.jsp	(.../viewforum.jsp)	(revision e8e86d379857a349822a501189888545e69e56ac)
+++ lams_tool_forum/web/jsps/learning/viewforum.jsp	(.../viewforum.jsp)	(revision 8121ab6e6a1166176a6c77a34a4eeee03ff0787c)
@@ -108,24 +108,22 @@
 							<fmt:message key="label.rateLimits.forum.reminder">
 								<fmt:param value="${sessionMap.minimumRate}"/>
 								<fmt:param value="${sessionMap.maximumRate}"/>
-							</fmt:message>						
-							<br>
+							</fmt:message>
 						</c:when>
 							
 						<c:when test="${sessionMap.minimumRate ne 0}">
 							<fmt:message key="label.rateLimits.forum.reminder.min">
 								<fmt:param value="${sessionMap.minimumRate}"/>
-							</fmt:message>					
-							<br>
+							</fmt:message>
 						</c:when>
 							
 						<c:when test="${sessionMap.maximumRate ne 0}">
 							<fmt:message key="label.rateLimits.forum.reminder.max">
 								<fmt:param value="${sessionMap.maximumRate}"/>
-							</fmt:message>					
-							<br>
+							</fmt:message>
 						</c:when>				
 					</c:choose>
+					&nbsp;
 								
 					<fmt:message key="label.rateLimits.topic.reminder">
 						<fmt:param value="<span id='numOfRatings'>${sessionMap.numOfRatings}</span>"/>
Index: lams_tool_forum/web/jsps/learning/viewtopic.jsp
===================================================================
diff -u -re8e86d379857a349822a501189888545e69e56ac -r8121ab6e6a1166176a6c77a34a4eeee03ff0787c
--- lams_tool_forum/web/jsps/learning/viewtopic.jsp	(.../viewtopic.jsp)	(revision e8e86d379857a349822a501189888545e69e56ac)
+++ lams_tool_forum/web/jsps/learning/viewtopic.jsp	(.../viewtopic.jsp)	(revision 8121ab6e6a1166176a6c77a34a4eeee03ff0787c)
@@ -99,7 +99,7 @@
 							</fmt:message>
 						</c:when>
 					</c:choose>
-					<br>
+					&nbsp;
 
 					<fmt:message key="label.rateLimits.topic.reminder">
 						<fmt:param value="<span id='numOfRatings'>${sessionMap.numOfRatings}</span>" />
Index: lams_tool_images/web/pages/authoring/parts/addimage5.jsp
===================================================================
diff -u -r793d3319ee7d2aa94af0559c0ee64c08ea6a4581 -r8121ab6e6a1166176a6c77a34a4eeee03ff0787c
--- lams_tool_images/web/pages/authoring/parts/addimage5.jsp	(.../addimage5.jsp)	(revision 793d3319ee7d2aa94af0559c0ee64c08ea6a4581)
+++ lams_tool_images/web/pages/authoring/parts/addimage5.jsp	(.../addimage5.jsp)	(revision 8121ab6e6a1166176a6c77a34a4eeee03ff0787c)
@@ -62,8 +62,8 @@
 					<fmt:message key="label.cancel" /> 
 				</button>
 				
-				<button type="button" id="addImageBtn" onclick="javascript:submitImageGalleryItem()" class="btn btn-sm btn-secondary button-add-item">
-					<i class="fa fa-upload me-1"></i> <fmt:message key="label.authoring.basic.add.image" /> 
+				<button type="button" id="addImageBtn" onclick="javascript:submitImageGalleryItem()" class="btn btn-sm btn-secondary btn-icon-add">
+					<fmt:message key="label.authoring.basic.add.image" /> 
 				</button>
 			</div>
 			
Index: lams_tool_images/web/pages/learning/learning.jsp
===================================================================
diff -u -r572226a47e63b49ca60f35de579ec230feaa409a -r8121ab6e6a1166176a6c77a34a4eeee03ff0787c
--- lams_tool_images/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 572226a47e63b49ca60f35de579ec230feaa409a)
+++ lams_tool_images/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 8121ab6e6a1166176a6c77a34a4eeee03ff0787c)
@@ -195,16 +195,22 @@
 		<lams:errors/>
 		
 		<%--Main image---------------------------------------------------%>
-		
-		<div class="fotorama-container">
-			<div class="fotorama"></div>
-		</div>
+		<div class="card lcard">
+			<div class="card-body">
+				<div class="fotorama-container">
+					<div class="fotorama"></div>
+				</div>
 			
-		<%--Comments & Ranking/Voting area----------------------------------------------%>	
-	 	
-		<div id="image-info">
-			<%@ include file="/pages/learning/parts/commentsarea.jsp"%>
+		<%--Comments & Ranking/Voting area-------------------------------%>
+				<div id="image-info">
+					<%@ include file="/pages/learning/parts/commentsarea.jsp"%>
+				</div>
+			</div>
 		</div>
+							
+		<c:if test="${(mode != 'teacher') && (imageGallery.allowRank || imageGallery.allowVote || imageGallery.allowShareImages) && imageGallery.allowShareImages && !finishedLock}">
+			<div id="new-image-input-area" class="mt-4"></div>
+		</c:if>	
  
 		<%--Reflection--------------------------------------------------%>
 
Index: lams_tool_images/web/pages/learning/parts/commentsarea.jsp
===================================================================
diff -u -r8de3eaa9202afa22c16447d5236943cbe4749eb1 -r8121ab6e6a1166176a6c77a34a4eeee03ff0787c
--- lams_tool_images/web/pages/learning/parts/commentsarea.jsp	(.../commentsarea.jsp)	(revision 8de3eaa9202afa22c16447d5236943cbe4749eb1)
+++ lams_tool_images/web/pages/learning/parts/commentsarea.jsp	(.../commentsarea.jsp)	(revision 8121ab6e6a1166176a6c77a34a4eeee03ff0787c)
@@ -1,15 +1,13 @@
 <%@ include file="/common/taglibs.jsp"%>
 <c:set var="lams"><lams:LAMSURL/></c:set>
-
-<c:if test="${not empty param.sessionMapID}">
-	<c:set var="sessionMapID" value="${param.sessionMapID}" />
-</c:if>
+<c:if test="${not empty param.sessionMapID}"><c:set var="sessionMapID" value="${param.sessionMapID}" /></c:if>
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 <c:set var="mode" value="${sessionMap.mode}" />
 <c:set var="imageGallery" value="${sessionMap.imageGallery}" />
 <c:set var="finishedLock" value="${sessionMap.finishedLock}" />
 <c:set var="isImageSelected" value="${not empty sessionMap.currentImage}" />
 <c:set var="toolSessionID" value="${sessionMap.toolSessionID}" />
+
 <style>
 	#new-image-input-area {
 		clear: both;
@@ -71,60 +69,54 @@
 				minNumberWordsLabel="label.minimum.number.words" />
 	</c:if>
 
-	<div id="extra-controls">
+	<div id="extra-controls" class="mb-3">
 				
-			<%--Voting area--------------%>
-		
-			<c:if test="${imageGallery.allowVote && isImageSelected}">
-				<form:form action="vote.do" method="post" modelAttribute="imageRatingForm" id="voting-form">
-					<input type="hidden" name="sessionMapID" value="${sessionMapID}"/>
-					<input type="hidden" name="imageUid" value="${sessionMap.currentImage.uid}"/>
+		<%--Voting area--------------%>
+		<c:if test="${imageGallery.allowVote && isImageSelected}">
+			<form:form action="vote.do" method="post" modelAttribute="imageRatingForm" id="voting-form">
+				<input type="hidden" name="sessionMapID" value="${sessionMapID}"/>
+				<input type="hidden" name="imageUid" value="${sessionMap.currentImage.uid}"/>
 
-					<div id="favourite-button" class="form-check float-end">
-						<input type="checkbox" name="vote" class="form-check-input" id="voting-form-checkbox" 
-								<c:if test="${finishedLock}">disabled="disabled"</c:if>	
-								<c:if test="${sessionMap.isVoted}">checked="checked"</c:if>	
-						/>
+				<div id="favourite-button" class="form-check float-end">
+					<input type="checkbox" name="vote" class="form-check-input" id="voting-form-checkbox" 
+							<c:if test="${finishedLock}">disabled="disabled"</c:if>	
+							<c:if test="${sessionMap.isVoted}">checked="checked"</c:if>	
+					/>
 						
-						<label for="voting-form-checkbox" id="voting-form-label" class="form-check-label">
-							<c:choose>
-								<c:when test="${sessionMap.isVoted}">
-									<fmt:message key='label.learning.unvote'/>
-								</c:when>
-								<c:otherwise>
-									<fmt:message key='label.learning.vote.here'/>
-								</c:otherwise>
-							</c:choose>
-						</label>
-					</div>
-				</form:form>							
-			</c:if>
+					<label for="voting-form-checkbox" id="voting-form-label" class="form-check-label">
+						<c:choose>
+							<c:when test="${sessionMap.isVoted}">
+								<fmt:message key='label.learning.unvote'/>
+							</c:when>
+							<c:otherwise>
+								<fmt:message key='label.learning.vote.here'/>
+							</c:otherwise>
+						</c:choose>
+					</label>
+				</div>
+			</form:form>
+		</c:if>
 			
-			<%--"Check for new", "Add new image" and "Delete" buttons---------------%>
-				
-			<div id="manage-image-buttons" class="btn-group" role="group" aria-label="Control buttons">	
-				<c:if test="${imageGallery.allowShareImages}">
-					<button onclick="return checkNew()" class="btn btn-sm btn-outline-secondary" id="check-for-new-button"> 
-						<i class="fa fa-refresh me-1"></i> <fmt:message key="label.check.for.new" /> 
-					</button>
+		<%--"Check for new", "Add new image" and "Delete" buttons---------------%>		
+		<div id="manage-image-buttons" class="btn-group" role="group" aria-label="Control buttons">	
+			<c:if test="${imageGallery.allowShareImages}">
+				<button type="button" onclick="return checkNew()" class="btn btn-sm btn-outline-secondary btn-icon-refresh" id="check-for-new-button"> 
+					<fmt:message key="label.check.for.new" /> 
+				</button>
 								
-					<c:if test="${not finishedLock}">
-						<button onclick="javascript:newImageInit('<lams:WebAppURL />authoring/newImageInit.do?sessionMapID=${sessionMapID}&bootstrap5=true&saveUsingLearningAction=true');"
-								class="btn btn-outline-secondary btn-sm" id="add-new-image-button">  
-							<i class="fa fa-upload me-1"></i> <fmt:message key="label.learning.add.new.image" />
-						</button>
-					</c:if>
+				<c:if test="${not finishedLock}">
+					<button type="button" onclick="javascript:newImageInit('<lams:WebAppURL />authoring/newImageInit.do?sessionMapID=${sessionMapID}&bootstrap5=true&saveUsingLearningAction=true');"
+							class="btn btn-outline-secondary btn-sm btn-icon-add" id="add-new-image-button"> 
+						<fmt:message key="label.learning.add.new.image" />
+					</button>
+				</c:if>
 					
-					<c:if test="${sessionMap.isAuthor}">
-						<button href="#nogo" onclick="return deleteImage(${sessionMap.currentImage.uid});" class="btn btn-outline-secondary btn-sm" id="delete-button"> 
-							<i class="fa fa-trash me-1"></i> <fmt:message key="label.learning.delete.image" /> 
-						</button>
-					</c:if>
+				<c:if test="${sessionMap.isAuthor}">
+					<button type="button" onclick="return deleteImage(${sessionMap.currentImage.uid});" class="btn btn-outline-secondary btn-sm btn-icon-remove" id="delete-button"> 
+						<fmt:message key="label.learning.delete.image" /> 
+					</button>
 				</c:if>
-			</div>		
+			</c:if>
+		</div>		
 	</div>
-							
-	<c:if test="${imageGallery.allowShareImages && !finishedLock}">
-		<div id="new-image-input-area" class="mt-4"></div>
-	</c:if>	
 </c:if>
\ No newline at end of file
Index: lams_tool_laqa/web/includes/css/qalearning.scss
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r8121ab6e6a1166176a6c77a34a4eeee03ff0787c
--- lams_tool_laqa/web/includes/css/qalearning.scss	(.../qalearning.scss)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_laqa/web/includes/css/qalearning.scss	(.../qalearning.scss)	(revision 8121ab6e6a1166176a6c77a34a4eeee03ff0787c)
@@ -12,9 +12,6 @@
     margin: 10px 0px;
     width: 88%;
 }
-.add-comment {
-    margin-top: 60px;
-}
  
 .hiddenEntryInMonitoring {
 	font-style: italic;
Index: lams_tool_laqa/web/learning/IndividualLearnerResults.jsp
===================================================================
diff -u -r572226a47e63b49ca60f35de579ec230feaa409a -r8121ab6e6a1166176a6c77a34a4eeee03ff0787c
--- lams_tool_laqa/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision 572226a47e63b49ca60f35de579ec230feaa409a)
+++ lams_tool_laqa/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision 8121ab6e6a1166176a6c77a34a4eeee03ff0787c)
@@ -40,9 +40,10 @@
 			<c:forEach var="questionEntry" items="${generalLearnerFlowDTO.mapQuestionContentLearner}">
 				<div class="card lcard mt-4" id="questions${questionEntry.key}">
 					<div class="card-header">
-						<strong>
-							<c:if test="${generalLearnerFlowDTO.mapQuestionContentLearner.size() != 1}">${questionEntry.key}.&nbsp;</c:if> <c:out value="${questionEntry.value.name}" escapeXml="false" />
-						</strong>
+						<c:if test="${generalLearnerFlowDTO.mapQuestionContentLearner.size() != 1}">
+							${questionEntry.key}.&nbsp;
+						</c:if> 
+						<c:out value="${questionEntry.value.name}" escapeXml="false" />
 					</div>
 
 					<div class="card-body">
@@ -52,24 +53,24 @@
 
 						<c:forEach var="answerEntry" items="${generalLearnerFlowDTO.mapAnswersPresentable}">
 							<c:if test="${answerEntry.key == questionEntry.key}">
-							<span class="fw-bold my-1">
-								<fmt:message key="label.learning.yourAnswer" />
-							</span>
+								<div class="card-subheader">
+									<fmt:message key="label.learning.yourAnswer" />
+								</div>
 
-								<div class="border border-primary p-3 m-2 border-opacity-50 rounded-2" id="answer${questionEntry.key}">
+								<div id="answer${questionEntry.key}">
 									<c:out value="${answerEntry.value}" escapeXml="false" />
 								</div>
 							</c:if>
 						</c:forEach>
 
 						<!-- Feedback -->
 						<c:if test="${(questionEntry.value.feedback != '') && (questionEntry.value.feedback != null) }">
-
-							<div class="panel panel-default mt-4" id="feedback${questionEntry.key}">
-								<div class="panel-heading panel-heading-sm panel-title">
+							<div id="feedback${questionEntry.key}">
+								<div class="card-subheader mt-4">
 									<fmt:message key="label.feedback" />
 								</div>
-								<div class="panel-body panel-body-sm">
+								
+								<div>
 									<c:out value="${questionEntry.value.feedback}" escapeXml="false" />
 								</div>
 							</div>
@@ -101,7 +102,7 @@
 									<fmt:message key="button.endLearning" />
 								</c:otherwise>
 							</c:choose>
-							</button>
+						</button>
 					</c:if>
 
 					<c:if test="${generalLearnerFlowDTO.reflection == 'true'}">
Index: lams_tool_laqa/web/learning/LearnerRep.jsp
===================================================================
diff -u -r7806cbb45faeff792419ef43f67c4fee6ffb03e9 -r8121ab6e6a1166176a6c77a34a4eeee03ff0787c
--- lams_tool_laqa/web/learning/LearnerRep.jsp	(.../LearnerRep.jsp)	(revision 7806cbb45faeff792419ef43f67c4fee6ffb03e9)
+++ lams_tool_laqa/web/learning/LearnerRep.jsp	(.../LearnerRep.jsp)	(revision 8121ab6e6a1166176a6c77a34a4eeee03ff0787c)
@@ -66,37 +66,6 @@
 			</lams:Alert5>
 		</c:if>
 
-		<!-- Rating limits info -->
-		<c:if test="${generalLearnerFlowDTO.allowRateAnswers && (qaContent.minimumRates ne 0 || qaContent.maximumRates ne 0)}">
-			<lams:Alert5 id="rating-info" type="info" close="true">
-				<c:choose>
-					<c:when test="${qaContent.minimumRates ne 0 and qaContent.maximumRates ne 0}">
-						<fmt:message key="label.rate.limits.reminder">
-							<fmt:param value="${qaContent.minimumRates}" />
-							<fmt:param value="${qaContent.maximumRates}" />
-						</fmt:message>
-					</c:when>
-
-					<c:when test="${qaContent.minimumRates ne 0 and qaContent.maximumRates eq 0}">
-						<fmt:message key="label.rate.limits.reminder.min">
-							<fmt:param value="${qaContent.minimumRates}" />
-						</fmt:message>
-					</c:when>
-
-					<c:when test="${qaContent.minimumRates eq 0 and qaContent.maximumRates ne 0}">
-						<fmt:message key="label.rate.limits.reminder.max">
-							<fmt:param value="${qaContent.maximumRates}" />
-						</fmt:message>
-					</c:when>
-				</c:choose>
-				<br>
-
-				<fmt:message key="label.rate.limits.topic.reminder">
-					<fmt:param value="<span id='count-rated-items'>${sessionMap.countRatedItems}</span>" />
-				</fmt:message>
-			</lams:Alert5>
-		</c:if>
-
 		<c:if test="${isLeadershipEnabled}">
 			<lams:LeaderDisplay idName="leader-enabled" username="${sessionMap.groupLeader.fullname}" userId="${sessionMap.groupLeader.queUsrId}"/>
 		</c:if>
@@ -108,27 +77,30 @@
 				<div class="card-header">
 					<c:if test="${generalLearnerFlowDTO.questions.size() != 1}">${status.count}.&nbsp;</c:if>
 					<c:out value="${question.qbQuestion.name}" escapeXml="false" />
-					
-					<div class="font-size-init">
-						<c:out value="${question.qbQuestion.description}" escapeXml="false" />
-					</div>
 				</div>
 
 				<div class="card-body">
+					<div class="mb-3">
+						<c:out value="${question.qbQuestion.description}" escapeXml="false" />
+					</div>
 						
 					<%--User own responses---------------------------------------%>
 					<c:set var="userResponse" value="${question.userResponse}"/>
 					<c:if test="${userResponse != null}">
-						<div class="row g-0">
+						<div class="card-subheader">
+							<fmt:message key="label.learning.yourAnswer" />
+						</div>
+					
+						<div class="row">
 							<!-- split if ratings are on -->
-							<c:set var="splitRow" value="col-12" />
+							<c:set var="splitRow" value="" />
 							<c:if test="${generalLearnerFlowDTO.allowRateAnswers}">
 								<c:set var="splitRow" value="col-12 col-sm-9 col-md-10 col-lg-10" />
 							</c:if>
 							
 							<div class="${splitRow}">
 								<div class="sbox">
-									<div class="sbox-heading bg-warning bg-opacity-50">
+									<div class="sbox-heading bg-warning bg-opacity-10">
 										<div class="float-start me-2">
 											<lams:Portrait userId="${userResponse.qaQueUser.queUsrId}"/>
 										</div>
@@ -158,6 +130,38 @@
 
 					<!-- Others users' responses -->
 					<c:if test="${generalLearnerFlowDTO.showOtherAnswers}">
+
+						<!-- Rating limits info -->
+						<c:if test="${generalLearnerFlowDTO.allowRateAnswers && (qaContent.minimumRates ne 0 || qaContent.maximumRates ne 0)}">
+							<lams:Alert5 id="rating-info" type="info" close="true">
+								<c:choose>
+									<c:when test="${qaContent.minimumRates ne 0 and qaContent.maximumRates ne 0}">
+										<fmt:message key="label.rate.limits.reminder">
+											<fmt:param value="${qaContent.minimumRates}" />
+											<fmt:param value="${qaContent.maximumRates}" />
+										</fmt:message>
+									</c:when>
+				
+									<c:when test="${qaContent.minimumRates ne 0 and qaContent.maximumRates eq 0}">
+										<fmt:message key="label.rate.limits.reminder.min">
+											<fmt:param value="${qaContent.minimumRates}" />
+										</fmt:message>
+									</c:when>
+				
+									<c:when test="${qaContent.minimumRates eq 0 and qaContent.maximumRates ne 0}">
+										<fmt:message key="label.rate.limits.reminder.max">
+											<fmt:param value="${qaContent.maximumRates}" />
+										</fmt:message>
+									</c:when>
+								</c:choose>
+								<br>
+				
+								<fmt:message key="label.rate.limits.topic.reminder">
+									<fmt:param value="<span id='count-rated-items'>${sessionMap.countRatedItems}</span>" />
+								</fmt:message>
+							</lams:Alert5>
+						</c:if>
+					
 						<c:if test="${isCommentsEnabled && sessionMap.commentsMinWordsLimit != 0}">
 							<lams:Alert5 id="rating-comment-info-${status.count}" type="info" close="false" >
 								<fmt:message key="label.comment.minimum.number.words">
@@ -179,7 +183,7 @@
 						</c:choose>
 
 						<div class="other-users-responses mt-4">
-							<div class="fst-italic mb-2">
+							<div class="card-subheader mb-2">
 								<fmt:message key="label.other.learners.answers" />
 							</div>
 						
@@ -190,7 +194,7 @@
 									
 								<c:choose>
 									<c:when test="${generalLearnerFlowDTO.allowRateAnswers}">
-										<th title="<fmt:message key='label.sort.by.rating'/>">
+										<th title="<fmt:message key='label.sort.by.rating'/>" class="text-center">
 											<fmt:message key="label.learning.rating" />
 										</th>
 									</c:when>
@@ -210,7 +214,6 @@
 
 				</div>
 			</div>
-
 		</c:forEach>
 		<!-- End questions and answers -->
 
@@ -341,10 +344,15 @@
 								rows += '<td style="vertical-align:top;">';
 
 								if (${generalLearnerFlowDTO.userNameVisible}) {
-									rows += definePortraitMiniHeader(userData["portraitId"], userData["userID"], '${lams}',
-											${qaContent.useSelectLeaderToolOuput} ? userData["sessionName"] : userData["userName"],
-											'<time class="timeago" title="' + userData["attemptTime"] + '" datetime="' + userData["timeAgo"] + '"></time>',
-											false, "sbox-heading bg-warning bg-opacity-50")
+									rows += definePortraitMiniHeader(
+										userData["portraitId"], 
+										userData["userID"], 
+										'${lams}',
+										${qaContent.useSelectLeaderToolOuput} ? userData["sessionName"] : userData["userName"],
+										'<time class="timeago" title="' + userData["attemptTime"] + '" datetime="' + userData["timeAgo"] + '"></time>',
+										false, 
+										"sbox-heading bg-warning bg-opacity-10"
+									)
 								}
 
 								rows += 	'<div class="user-answer">';
@@ -445,10 +453,14 @@
 											//show comments textarea and a submit button
 										} else if (! (IS_DISABLED || usesRatings && MAX_RATES>0 && countRatedItems >= MAX_RATES && !hasStartedRating)) {
 											rows += '<div id="add-comment-area-' + itemId + '">' +
-														'<textarea class="form-control comment-textarea" name="comment" rows="4" id="comment-textarea-'+ itemId +'" onfocus="if(this.value==this.defaultValue)this.value=\'\';" onblur="if(this.value==\'\')this.value=this.defaultValue;" placeholder="<fmt:message key="label.comment.textarea.tip"/>" aria-label="<fmt:message key="label.comment.textarea.tip"/>"></textarea>' +
-													 	'<button type="button" class="btn btn-success btn-sm add-comment add-comment-new" data-item-id="'+ itemId +'" data-comment-criteria-id="'+ commentsCriteriaId +'" aria-label="submit">' +
-														 	'<i class="fa fa-check fa-lg"></i>' + 
-														 '</button>' +
+														'<div class="d-flex align-items-center">' +
+															'<textarea class="form-control comment-textarea" name="comment" rows="4" id="comment-textarea-'+ itemId +'" ' +
+																	'onfocus="if(this.value==this.defaultValue)this.value=\'\';" onblur="if(this.value==\'\')this.value=this.defaultValue;" ' +
+																	'placeholder="<fmt:message key="label.comment.textarea.tip"/>" aria-label="<fmt:message key="label.comment.textarea.tip"/>"></textarea>' +
+														 	'<button type="button" class="btn btn-secondary btn-sm add-comment add-comment-new ms-2" data-item-id="'+ itemId +'" data-comment-criteria-id="'+ commentsCriteriaId +'" aria-label="submit">' +
+															 	'<i class="fa-solid fa-paper-plane"></i>' + 
+															 '</button>' +
+														 '</div>' +
 													'</div>';
 										}
 									}
Index: lams_tool_leader/web/pages/learning/leaderselection.jsp
===================================================================
diff -u -r572226a47e63b49ca60f35de579ec230feaa409a -r8121ab6e6a1166176a6c77a34a4eeee03ff0787c
--- lams_tool_leader/web/pages/learning/leaderselection.jsp	(.../leaderselection.jsp)	(revision 572226a47e63b49ca60f35de579ec230feaa409a)
+++ lams_tool_leader/web/pages/learning/leaderselection.jsp	(.../leaderselection.jsp)	(revision 8121ab6e6a1166176a6c77a34a4eeee03ff0787c)
@@ -1,8 +1,6 @@
 <!DOCTYPE html>
 <%@ include file="/common/taglibs.jsp"%>
-<c:set var="lams">
-	<lams:LAMSURL />
-</c:set>
+<c:set var="lams"><lams:LAMSURL /></c:set>
 	
 <lams:PageLearner title="${content.title}" toolSessionID="${toolSessionID}">
 	<link type="text/css" href="${lams}css/jquery-ui-bootstrap-theme5.css" rel="stylesheet" />
@@ -101,13 +99,10 @@
 					userId="${groupLeader.userId}" />
 			</c:when>
 			<c:otherwise>
-				<lams:Alert5 type="warning" id="no-leader" close="false">
-					<h4>
-						<fmt:message key="label.no.leader.yet.title" />
-					</h4>
-					<p>
-						<fmt:message key="label.no.leader.yet.body" />
-					</p>
+				<fmt:message key="label.no.leader.yet.title" var="alertTitle"/>
+				<lams:Alert5 type="warning" id="no-leader" close="false"
+						title="${alertTitle}">
+					<fmt:message key="label.no.leader.yet.body" />
 				</lams:Alert5>
 			</c:otherwise>
 		</c:choose>
@@ -160,11 +155,11 @@
 	<div id="leaderSelectionDialog" class="modal fade" data-bs-keyboard="true" tabindex="-1" aria-labelledby="exampleModalLabel" aria-modal="true">
 		<div class="modal-dialog modal-dialog-centered">
 			<div class="modal-content">
-				<div class="modal-header">
-					<h1 class="modal-title fs-5" id="exampleModalLabel">
+				<div class="modal-header text-bg-secondary">
+					<h1 class="modal-title text-white fs-5" id="exampleModalLabel">
 						<fmt:message key="label.are.you.going.to.be.leader" />
 					</h1>
-					<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+					<button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal" aria-label="Close"></button>
 				</div>
 					
 				<div class="modal-body">
@@ -173,32 +168,29 @@
 						<c:out value="${content.instructions}" escapeXml="false" />
 					</div>
 						
-					<div class="card lcard mt-3">
+					<div class="ltable table-hover mt-3">
 						<div class="card-header">
 							<fmt:message key="label.users.from.group" />
 						</div>
-						
-						<div class="card-body mb-3">
-							<div id="usersInGroup-modal" class="row mt-n2" role="list">
-								<c:forEach var="user" items="${groupUsers}">
-									<div id="user-${user.userId}-modal" role="listitem" class="mt-3 ms-3">
-										<lams:Portrait userId="${user.userId}" />
-										<span> 
-											<c:out value="${user.firstName} ${user.lastName}" escapeXml="true" />
-										</span>
-									</div>
-								</c:forEach>
+
+						<c:forEach var="user" items="${groupUsers}">
+							<div id="user-${user.userId}-modal" class="ps-2">
+								<lams:Portrait userId="${user.userId}" />
+								<span class="ms-2"> 
+									<c:out value="${user.firstName} ${user.lastName}" escapeXml="true" />
+								</span>
 							</div>
-						</div>
+						</c:forEach>
 					</div>
 				</div>
 
 				<div class="modal-footer">
-					<button data-bs-dismiss="modal" class="btn btn-secondary">
+					<button type="button" data-bs-dismiss="modal" class="btn btn-secondary">
 						<i class="fa fa-xmark fa-lg me-1"></i>
 						<fmt:message key="label.no" />
 					</button>
-					<button onclick="leaderSelection();" class="btn btn-primary">
+					
+					<button type="button" onclick="leaderSelection();" class="btn btn-primary">
 						<i class="fa fa-check fa-lg me-1"></i>
 						<fmt:message key="label.yes.become.leader" />
 					</button>
Index: lams_tool_notebook/web/pages/learning/notebook.jsp
===================================================================
diff -u -r572226a47e63b49ca60f35de579ec230feaa409a -r8121ab6e6a1166176a6c77a34a4eeee03ff0787c
--- lams_tool_notebook/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 572226a47e63b49ca60f35de579ec230feaa409a)
+++ lams_tool_notebook/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 8121ab6e6a1166176a6c77a34a4eeee03ff0787c)
@@ -124,40 +124,42 @@
 		</c:if>
 
 		<!-- Form -->
-		<div class="mb-4 shadow">
-			<c:choose>
-				<c:when test="${contentEditable}">
-					<c:choose>
-						<c:when test="${notebookDTO.allowRichEditor}">
-							<lams:CKEditor id="entryText" value="${messageForm.entryText}" height="200" contentFolderID="${learnerContentFolder}"
-								toolbarSet="DefaultLearner"
-								ariaLabelledby="instructions">
-							</lams:CKEditor>
-						</c:when>
-
-						<c:otherwise>
-							<form:textarea rows="8" path="entryText" cssClass="form-control" id="entryText" aria-labelledby="instructions"/>
-						</c:otherwise>
-					</c:choose>
-				</c:when>
-
-				<c:otherwise>
-					<div class="sbox sbox-body mt-2 bg-warning">
-						<lams:out value="${messageForm.entryText}" />
+		<div class="card lcard">
+			<div class="card-body">
+				<c:choose>
+					<c:when test="${contentEditable}">
+						<c:choose>
+							<c:when test="${notebookDTO.allowRichEditor}">
+								<lams:CKEditor id="entryText" value="${messageForm.entryText}" height="200" contentFolderID="${learnerContentFolder}"
+									toolbarSet="DefaultLearner"
+									ariaLabelledby="instructions">
+								</lams:CKEditor>
+							</c:when>
+	
+							<c:otherwise>
+								<form:textarea rows="8" path="entryText" cssClass="form-control" id="entryText" aria-labelledby="instructions"/>
+							</c:otherwise>
+						</c:choose>
+					</c:when>
+	
+					<c:otherwise>
+						<div class="sbox sbox-body mt-2 bg-warning">
+							<lams:out value="${messageForm.entryText}" />
+						</div>
+					</c:otherwise>
+				</c:choose>
+	
+				<c:if test="${not empty teachersComment}">
+					<div class="panel panel-default mt-2 me-2">
+						<div class="panel-heading">
+							<fmt:message key="label.reply.comment" />
+						</div>
+						<div class="panel-body">
+							<lams:out value="${teachersComment}" escapeHtml="true" />
+						</div>
 					</div>
-				</c:otherwise>
-			</c:choose>
-
-			<c:if test="${not empty teachersComment}">
-				<div class="panel panel-default mt-2 me-2">
-					<div class="panel-heading">
-						<fmt:message key="label.reply.comment" />
-					</div>
-					<div class="panel-body">
-						<lams:out value="${teachersComment}" escapeHtml="true" />
-					</div>
-				</div>
-			</c:if>
+				</c:if>
+			</div>
 		</div>
 
 		<c:if test="${mode != 'teacher'}">
Index: lams_tool_preview/web/pages/learning/learning.jsp
===================================================================
diff -u -r572226a47e63b49ca60f35de579ec230feaa409a -r8121ab6e6a1166176a6c77a34a4eeee03ff0787c
--- lams_tool_preview/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 572226a47e63b49ca60f35de579ec230feaa409a)
+++ lams_tool_preview/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 8121ab6e6a1166176a6c77a34a4eeee03ff0787c)
@@ -35,10 +35,10 @@
 	<lams:JSImport src="includes/javascript/common.js" />
 	<script type="text/javascript">
 		function hideButtons() {
-			$("#buttonNextPrevDiv button").prop('disabled', true);
+			$("#button-next-prev-area button").prop('disabled', true);
 		}	
 		function showButtons() {
-			$("#buttonNextPrevDiv button").prop('disabled', false);
+			$("#button-next-prev-area button").prop('disabled', false);
 		}	
 
  		function finishSession(){
@@ -93,44 +93,44 @@
 			</c:if>
 		</div>
 		
-			<c:choose>
-				<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == isComment}">					
-					<%@ include file="comment.jsp"%>
-				</c:when>
+		<c:choose>
+			<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == isComment}">					
+				<%@ include file="comment.jsp"%>
+			</c:when>
 				
-				<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == isStar}">
-					<%@ include file="star.jsp"%>
-				</c:when>
+			<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == isStar}">
+				<%@ include file="star.jsp"%>
+			</c:when>
 				
-				<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == isRanking}">
-					<c:choose>
-						<c:when test="${rateAllUsers > 0}">
-							<%@ include file="rankall.jsp"%>
-						</c:when>
-						<c:otherwise>
-							<%@ include file="ranking.jsp"%>
-						</c:otherwise>
-					</c:choose>
-				</c:when>
+			<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == isRanking}">
+				<c:choose>
+					<c:when test="${rateAllUsers > 0}">
+						<%@ include file="rankall.jsp"%>
+					</c:when>
+					<c:otherwise>
+						<%@ include file="ranking.jsp"%>
+					</c:otherwise>
+				</c:choose>
+			</c:when>
 				
-				<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == isHedging}">
-					<%@ include file="hedging.jsp"%>
-				</c:when>
+			<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == isHedging}">
+				<%@ include file="hedging.jsp"%>
+			</c:when>
 				
-				<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == isRubrics}">
-					<c:choose>
-						<c:when test="${peerreview.rubricsView eq 2}">
-							<%@ include file="rubricsPivot.jsp"%>
-						</c:when>
-						<c:otherwise>
-							<%@ include file="rubrics.jsp"%>
-						</c:otherwise>
-					</c:choose>
-				</c:when>
-			</c:choose>
+			<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == isRubrics}">
+				<c:choose>
+					<c:when test="${peerreview.rubricsView eq 2}">
+						<%@ include file="rubricsPivot.jsp"%>
+					</c:when>
+					<c:otherwise>
+						<%@ include file="rubrics.jsp"%>
+					</c:otherwise>
+				</c:choose>
+			</c:when>
+		</c:choose>
 
 		<div class="activity-bottom-buttons">
-			<div id="buttonNextPrevDiv">
+			<div id="button-next-prev-area">
 				<c:choose>	
 					<c:when test="${finishedLock || mode == 'teacher'}">
 						<c:set var="method">nextPrev</c:set>
@@ -160,7 +160,7 @@
 				</c:choose>
 			</div>
 						
-			<button type="button" id="refreshButton" class="btn btn-secondary btn-icon-refresh me-4" onclick="javascript:refresh();">
+			<button type="button" id="refreshButton" class="btn btn-secondary btn-icon-refresh me-2" onclick="javascript:refresh();">
 				<fmt:message key="label.refresh"/>
 			</button>
 		</div>			
Index: lams_tool_sbmt/web/learner/sbmtlearner.jsp
===================================================================
diff -u -rc3888371ef51396eac033e0617292dc5a07af6aa -r8121ab6e6a1166176a6c77a34a4eeee03ff0787c
--- lams_tool_sbmt/web/learner/sbmtlearner.jsp	(.../sbmtlearner.jsp)	(revision c3888371ef51396eac033e0617292dc5a07af6aa)
+++ lams_tool_sbmt/web/learner/sbmtlearner.jsp	(.../sbmtlearner.jsp)	(revision 8121ab6e6a1166176a6c77a34a4eeee03ff0787c)
@@ -11,9 +11,7 @@
 <c:set var="hasEditRight" value="${sessionMap.hasEditRight}"/>
 <c:set var="language"><lams:user property="localeLanguage"/></c:set>
 
-
 <lams:PageLearner title="${sessionMap.title}" toolSessionID="${sessionMap.toolSessionID}" >
-
 	<link href="<lams:LAMSURL />css/uppy.min.css" rel="stylesheet" type="text/css" />
 	<link href="<lams:LAMSURL />css/uppy.custom5.css" rel="stylesheet" type="text/css" />
 	<style>
@@ -115,19 +113,19 @@
 
 					<!--File path row -->
 					<div class="card lcard">
-						<div class="card-header">
-							<fmt:message key="label.learner.upload" />
-						</div>
-
 						<div class="card-body">
+							<div class="card-subheader">
+								<fmt:message key="label.learner.upload" />
+							</div>
+						
 							<div class="form-floating">
 								<label for="file-upload-area" class="d-none"><fmt:message key="label.learner.filePath" />&nbsp;<span style="color: red">*</span></label>
 
 								<div id="file-upload-area" name="file-upload-area" class="m-1"></div>
 							</div>
 
 							<!--File Description -->
-							<div class="form-floating m-3">
+							<div class="form-floating my-3">
 								<form:textarea style="height: 80px" id="description" aria-multiline="true" aria-required="true" required="true" cssClass="form-control" path="description" placeholder="-"></form:textarea>
 								<label for="description"><fmt:message key="label.learner.fileDescription" /></label>
 								<div id="desc-error-msg" class="text-danger" style="display: none;"></div>
@@ -140,11 +138,12 @@
 							</div>
 
 							<c:if test="${hasEditRight}">
-								<div class="mb-3 text-center">
+								<div class="mb-3 text-end">
 									<button id="uploadButton" type="submit" <c:if test="${sessionMap.finishLock || sessionMap.maxLimitReached}">disabled="disabled"</c:if>
-											class="btn btn-secondary btn-success btn-disable-on-submit"
+											class="btn btn-secondary btn-disable-on-submit"
 											title='<fmt:message key="label.add.tip" />' >
-										<i class="fa-solid fa-paper-plane" aria-hidden="true"></i> <fmt:message key="label.add" />
+										<i class="fa-solid fa-cloud-arrow-up me-1" aria-hidden="true"></i>
+										<fmt:message key="label.add" />
 									</button>
 								</div>
 							</c:if>
@@ -158,8 +157,6 @@
 			<!-- end div uppy form-->
 		</div>
 
-
-
 		<!--Checks if the filesUploaded property of the SbmtLearnerForm is set -->
 		<div id="submittedFiles" class="mt-4">
 			<c:choose>
@@ -170,40 +167,52 @@
 				</c:when>
 
 				<c:otherwise>
-					<h3 class="mt-5">
-						<fmt:message key="monitoring.user.submittedFiles" />
-					</h3>
-					<small class="text-muted"><c:out value="${fn:length(learner.filesUploaded)}" />&nbsp;<fmt:message key="label.files" /></small>
+					<div class="card lcard">
+						<div class="card-body">
+							<div class="card-subheader mb-4">
+								<fmt:message key="monitoring.user.submittedFiles" />
+								
+								<small class="text-muted">
+									<c:out value="${fn:length(learner.filesUploaded)}" />&nbsp;<fmt:message key="label.files" />
+								</small>
+							</div>
 
-					<div role="list" class="mt-2 mb-4" aria-labelledby="submittedFiles">
+					<div class="ltable no-header table-striped div-hover mt-2 mb-4">
 						<c:forEach var="file" items="${learner.filesUploaded}" varStatus="status">
-							<div role="listitem" class="card lcard mt-4">
+							<div class="p-3">
 								<!--The name of the File -->
 								<c:if test="${file.currentLearner}">
-									<div class="card-header">
+									<div>
 										<c:set var="downloadURL">
 											<c:url value="/download?uuid=${file.displayUuid}&versionID=${file.versionID}&preferDownload=true" />
 										</c:set>
-										<i class="fa-regular fa-file" aria-label="false"></i> &nbsp;<a class="fw-bold" style="color: var(--bs-link-hover-color)" href="${downloadURL}" aria-label="<fmt:message key="label.download" />"><c:out value="${file.filePath}" /></a>
+										<i class="fa-regular fa-file" aria-label="false"></i> &nbsp;
+										<a class="fw-bold" style="color: var(--bs-link-hover-color)" href="${downloadURL}" aria-label="<fmt:message key="label.download" />">
+											<c:out value="${file.filePath}" />
+										</a>
+										
 										<div class="float-end">
 											<c:if test="${empty file.marks && hasEditRight}">
-												<a href="javascript:deleteLearnerFile(${file.submissionID}, '${file.filePath}');" class="btn btn-primary btn-disable-on-submit"
-												   title="<fmt:message key="label.monitoring.original.learner.file.delete"/>">
-													<i class="fa fa-trash" aria-label="<fmt:message key="label.monitoring.original.learner.file.delete"/>"></i>
-												</a>
+												<button type="button" onclick="javascript:deleteLearnerFile(${file.submissionID}, '${file.filePath}');" 
+													class="btn btn-danger btn-disable-on-submit px-2"
+													title="<fmt:message key="label.monitoring.original.learner.file.delete"/>">
+													<i class="fa fa-trash fa-lg" aria-label="<fmt:message key="label.monitoring.original.learner.file.delete"/>"></i>
+												</button>
 											</c:if>
 
-											<a href="${downloadURL}"  class="btn btn-primary btn-disable-on-submit" title="<fmt:message key="label.download" />" >
-												<i class="fa fa-download" aria-label="<fmt:message key="label.download" />"></i>
+											<a href="${downloadURL}" class="btn btn-secondary btn-disable-on-submit px-2" title="<fmt:message key="label.download" />" >
+												<i class="fa fa-download fa-lg" aria-label="<fmt:message key="label.download" />"></i>
 											</a>
 										</div>
+										
 										<br>
 										<small>
 											<fmt:message key="label.learner.time" />&nbsp;<lams:Date value="${file.dateOfSubmission}" timeago="true"/>
 										</small>
 									</div>
 								</c:if>
-								<div class="card-body">
+								
+								<div>
 									<!--The description of the File -->
 									<div id="fileDescription" aria-label="<fmt:message key='label.learner.fileDescription' />">
 										<lams:out value="${file.fileDescription}" escapeHtml="true" />
@@ -248,6 +257,8 @@
 							</div>
 						</c:forEach>
 					</div>
+					</div>
+					</div>
 
 				</c:otherwise>
 			</c:choose>
@@ -257,7 +268,7 @@
 		<c:if test="${sessionMap.userFinished and sessionMap.reflectOn}">
 			<lams:NotebookReedit
 				reflectInstructions="${sessionMap.reflectInstructions}"
-				reflectEntry="${learner.reflectEntry}"
+				reflectEntry="${learner.reflect}"
 				isEditButtonEnabled="${sessionMap.mode != 'teacher'}"
 				notebookHeaderLabelKey="title.reflection"/>
 		</c:if>
@@ -267,17 +278,16 @@
 			<c:if test="${sessionMap.mode != 'teacher'}">
 				<c:choose>
 					<c:when test="${sessionMap.reflectOn and (not sessionMap.userFinished)}">
-						<button id="notebookButton" onclick="javascript:notebook();"
+						<button type="button" id="notebookButton" onclick="javascript:notebook();"
 								class="btn btn-primary btn-disable-on-submit
 								   ${sessionMap.mode eq 'author' or empty sessionMap.minLimitUploadNumber ? '' : 'btn-hide-on-min-not-met'}">
 							<fmt:message key="label.continue" />
 						</button>
 					</c:when>
 					<c:otherwise>
-						<button type="button"
+						<button type="button" id="finishButton"
 								class="btn btn-primary btn-disable-on-submit na
-								   ${sessionMap.mode eq 'author' or empty sessionMap.minLimitUploadNumber ? '' : 'btn-hide-on-min-not-met'}"
-								id="finishButton">
+								   ${sessionMap.mode eq 'author' or empty sessionMap.minLimitUploadNumber ? '' : 'btn-hide-on-min-not-met'}">
 							<c:choose>
 								<c:when test="${isLastActivity}">
 									<fmt:message key="button.submit" />
Index: lams_tool_scratchie/web/includes/css/scratchie-learning.scss
===================================================================
diff -u -r261520f042046fcb6f4f85c596495e3ea98311aa -r8121ab6e6a1166176a6c77a34a4eeee03ff0787c
--- lams_tool_scratchie/web/includes/css/scratchie-learning.scss	(.../scratchie-learning.scss)	(revision 261520f042046fcb6f4f85c596495e3ea98311aa)
+++ lams_tool_scratchie/web/includes/css/scratchie-learning.scss	(.../scratchie-learning.scss)	(revision 8121ab6e6a1166176a6c77a34a4eeee03ff0787c)
@@ -30,7 +30,7 @@
 	padding-top: 5px;
 }
 
-.burning-question-container, .question-etherpad-container {
+.question-etherpad-container {
 	padding: 0 15px;
 }
 .answer-description {
Index: lams_tool_scratchie/web/pages/learning/results.jsp
===================================================================
diff -u -re977dc3c8ca28d9a515f34d0c390142ed24ae8d2 -r8121ab6e6a1166176a6c77a34a4eeee03ff0787c
--- lams_tool_scratchie/web/pages/learning/results.jsp	(.../results.jsp)	(revision e977dc3c8ca28d9a515f34d0c390142ed24ae8d2)
+++ lams_tool_scratchie/web/pages/learning/results.jsp	(.../results.jsp)	(revision 8121ab6e6a1166176a6c77a34a4eeee03ff0787c)
@@ -353,7 +353,7 @@
 
 		<lams:errors5/>
 
-		<lams:Alert5 id="score" type="info" close="false">
+		<lams:Alert5 id="score" type="success" close="false">
 			<fmt:message key="label.you.ve.got">
 				<fmt:param>${score}</fmt:param>
 				<fmt:param>${scorePercentage}</fmt:param>
Index: lams_tool_scratchie/web/pages/learning/scratchies.jsp
===================================================================
diff -u -r8ab1c658eca81a42d7f21d0067bff04c15f70c38 -r8121ab6e6a1166176a6c77a34a4eeee03ff0787c
--- lams_tool_scratchie/web/pages/learning/scratchies.jsp	(.../scratchies.jsp)	(revision 8ab1c658eca81a42d7f21d0067bff04c15f70c38)
+++ lams_tool_scratchie/web/pages/learning/scratchies.jsp	(.../scratchies.jsp)	(revision 8121ab6e6a1166176a6c77a34a4eeee03ff0787c)
@@ -203,15 +203,15 @@
 			
 			<%-- show burning questions --%>
 			<c:if test="${!showResults && scratchie.burningQuestionsEnabled && (isUserLeader || (mode == 'teacher'))}">
-				<div class="burning-question-container mb-3">
+				<div class="burning-question-container mb-2 mt-4">
 					<button type="button" id="bq${item.uid}" data-bs-toggle="collapse" data-bs-target="#burning-question-item${item.uid}"
 							class="btn btn-light btn-sm <c:if test="${empty item.burningQuestion}">collapsed</c:if>">
 						<span class="if-collapsed"><i class="fa fa-xs fa-regular fa-square-plus" aria-hidden="true"></i></span>
 		  				<span class="if-not-collapsed"><i class="fa fa-xs fa-regular fa-square-minus" aria-hidden="true"></i></span>
 						<fmt:message key="label.burning.question" />
 					</button>
 					
-					<div id="burning-question-item${item.uid}" class="collapse <c:if test="${not empty item.burningQuestion}">show</c:if> p-2">
+					<div id="burning-question-item${item.uid}" class="collapse <c:if test="${not empty item.burningQuestion}">show</c:if> pt-3">
 						<textarea rows="5" name="burningQuestion${item.uid}" class="form-control" aria-labelledby="questionTitle${questionNumber.count} bq${item.uid}" 
 							<c:if test="${mode == 'teacher'}">disabled="disabled"</c:if>
 						>${item.burningQuestion}</textarea>
Index: lams_tool_spreadsheet/web/pages/learning/learning.jsp
===================================================================
diff -u -re636bcd864914f8b3045b66247935ff41e403ac6 -r8121ab6e6a1166176a6c77a34a4eeee03ff0787c
--- lams_tool_spreadsheet/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision e636bcd864914f8b3045b66247935ff41e403ac6)
+++ lams_tool_spreadsheet/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 8121ab6e6a1166176a6c77a34a4eeee03ff0787c)
@@ -55,14 +55,16 @@
 		</div>
 
 		<input type=hidden name="spreadsheetCode" id="spreadsheet-code" value="${sessionMap.code}"/>
-		
-		<c:if test="${spreadsheet.markingEnabled}">
-			<div class="card lcard mb-3">
-				<div class="card-body">
+
+		<div class="card lcard mb-3">
+			<div class="card-body">	
+			
+				<c:if test="${spreadsheet.markingEnabled}">
 					<div class="row">
 						<div class="col-2">
 							<fmt:message key="label.learning.comments" />
 						</div>
+						
 						<div class="col-10">
 							<c:choose>
 								<c:when test="${mark == null}">
@@ -79,6 +81,7 @@
 						<div class="col-2">
 							<fmt:message key="label.learning.marks" />
 						</div>
+						
 						<div class="col-10">
 							<c:choose>
 								<c:when test="${mark == null}">
@@ -90,14 +93,11 @@
 							</c:choose>
 						</div>
 					</div>
-				</div>
-			</div>
-		</c:if>		
+					
+					<hr class="msg-hr mb-4" />
+				</c:if>		
 
-		<div class="card lcard">
-			<div class="card-body">
-				<iframe
-						id="externalSpreadsheet" name="externalSpreadsheet" src="<lams:WebAppURL/>includes/javascript/simple_spreadsheet/spreadsheet_offline.html?lang=${language}"
+				<iframe id="externalSpreadsheet" name="externalSpreadsheet" src="<lams:WebAppURL/>includes/javascript/simple_spreadsheet/spreadsheet_offline.html?lang=${language}"
 						style="width:99%;" frameborder="no" height="385px"
 						scrolling="no">
 				</iframe>
Index: lams_tool_survey/web/pages/learning/result.jsp
===================================================================
diff -u -rb16c939172548a36f20eaa242698f99cda07c222 -r8121ab6e6a1166176a6c77a34a4eeee03ff0787c
--- lams_tool_survey/web/pages/learning/result.jsp	(.../result.jsp)	(revision b16c939172548a36f20eaa242698f99cda07c222)
+++ lams_tool_survey/web/pages/learning/result.jsp	(.../result.jsp)	(revision 8121ab6e6a1166176a6c77a34a4eeee03ff0787c)
@@ -137,7 +137,7 @@
 					<c:if test="${(not sessionMap.finishedLock) && (not sessionMap.showOnOnePage)}">
 						<div>
 							<button type="button" onclick="retakeSurvey(${question.sequenceId})" class="btn btn-sm btn-secondary btn-icon-return float-end mt-1">
-								<small><fmt:message key="label.retake" /></small>
+								<fmt:message key="label.retake" />
 							</button>
 						</div>
 					</c:if>
Index: lams_tool_survey/web/pages/learning/resultOtherUsers.jsp
===================================================================
diff -u -rb16c939172548a36f20eaa242698f99cda07c222 -r8121ab6e6a1166176a6c77a34a4eeee03ff0787c
--- lams_tool_survey/web/pages/learning/resultOtherUsers.jsp	(.../resultOtherUsers.jsp)	(revision b16c939172548a36f20eaa242698f99cda07c222)
+++ lams_tool_survey/web/pages/learning/resultOtherUsers.jsp	(.../resultOtherUsers.jsp)	(revision 8121ab6e6a1166176a6c77a34a4eeee03ff0787c)
@@ -164,14 +164,14 @@
 
 		<%-- other users personal results--%>
 		<c:if test="${sessionMap.showOtherUsersAnswers}">
-			<div class="card-subheader">
+			<div class="card-subheader mb-3">
 				<fmt:message key="label.other.answers" />
-			</div>
 			
-			<div class="alert alert-info badge mb-4">
-				<fmt:message key="label.total.responses">
-					<fmt:param>${countFinishedUser}</fmt:param>
-				</fmt:message>
+				<span class="alert alert-info badge ms-2 p-2">
+					<fmt:message key="label.total.responses">
+						<fmt:param>${countFinishedUser}</fmt:param>
+					</fmt:message>
+				</span>
 			</div>
 
 			<c:forEach var="question" items="${answerDtos}" varStatus="queStatus">
Index: lams_tool_task/web/pages/learning/parts/commentlist.jsp
===================================================================
diff -u -r793d3319ee7d2aa94af0559c0ee64c08ea6a4581 -r8121ab6e6a1166176a6c77a34a4eeee03ff0787c
--- lams_tool_task/web/pages/learning/parts/commentlist.jsp	(.../commentlist.jsp)	(revision 793d3319ee7d2aa94af0559c0ee64c08ea6a4581)
+++ lams_tool_task/web/pages/learning/parts/commentlist.jsp	(.../commentlist.jsp)	(revision 8121ab6e6a1166176a6c77a34a4eeee03ff0787c)
@@ -19,7 +19,7 @@
 <c:forEach var="comment" items="${itemDTO.comments}">
 	<c:if test="${(sessionMap.userLogin == comment.createBy.loginName) || (sessionMap.mode == 'teacher') || (sessionMap.mode == 'author')}">
 		<div class="card mt-2">
-			<div class="card-header text-bg-warning bg-opacity-50">
+			<div class="card-header">
 				<c:if test="${not empty comment.createBy.userId}">
 					<lams:Portrait userId="${comment.createBy.userId}"/>&nbsp;
 				</c:if>