Index: lams_tool_whiteboard/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -re686259177d09bfb23c125b78ef1209d7d7f7e69 -r7cc3bf0a1c503019da5c957de4803dcb54c431ee
--- lams_tool_whiteboard/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision e686259177d09bfb23c125b78ef1209d7d7f7e69)
+++ lams_tool_whiteboard/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 7cc3bf0a1c503019da5c957de4803dcb54c431ee)
@@ -136,3 +136,5 @@
 label.monitoring.learner.marks.name = Name
 label.show.chat.tooltip = Enables the chat feature allowing students to exchange messages while working on the drawing simultaneously.
 label.monitoring.summary.time.limit.expired = Expired
+label.comment.textarea.tip = Type your comment here then click on the green tick
+warning.comment.blank = Comment text is missing.
\ No newline at end of file
Index: lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/service/WhiteboardService.java
===================================================================
diff -u -rcf53a39fbd08dd3125cceba14221ac809ae6df13 -r7cc3bf0a1c503019da5c957de4803dcb54c431ee
--- lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/service/WhiteboardService.java	(.../WhiteboardService.java)	(revision cf53a39fbd08dd3125cceba14221ac809ae6df13)
+++ lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/service/WhiteboardService.java	(.../WhiteboardService.java)	(revision 7cc3bf0a1c503019da5c957de4803dcb54c431ee)
@@ -306,7 +306,7 @@
 	    Set<Long> itemIds = sessionList.stream()
 		    .collect(Collectors.mapping(WhiteboardSession::getSessionId, Collectors.toSet()));
 
-	    List<ItemRatingDTO> itemRatingDtos = ratingService.getRatingCriteriaDtos(contentId, null, itemIds, false,
+	    List<ItemRatingDTO> itemRatingDtos = ratingService.getRatingCriteriaDtos(contentId, null, itemIds, true,
 		    ratingUserId);
 	    // Mapping of Item ID -> DTO
 	    itemRatingDtoMap = itemRatingDtos.stream()
@@ -452,6 +452,7 @@
 	    criterion.setTitle(messageService.getMessage("label.pad.rating.title"));
 	    criterion.setOrderId(1);
 	    criterion.setRatingStyle(RatingCriteria.RATING_STYLE_STAR);
+	    criterion.setCommentsEnabled(true);
 	    criterion.setToolContentId(toolContentId);
 
 	    whiteboardDao.insert(criterion);
Index: lams_tool_whiteboard/web/pages/learning/galleryWalk.jsp
===================================================================
diff -u -r645056c136b15a368e557dd13ea7154b0eea48a2 -r7cc3bf0a1c503019da5c957de4803dcb54c431ee
--- lams_tool_whiteboard/web/pages/learning/galleryWalk.jsp	(.../galleryWalk.jsp)	(revision 645056c136b15a368e557dd13ea7154b0eea48a2)
+++ lams_tool_whiteboard/web/pages/learning/galleryWalk.jsp	(.../galleryWalk.jsp)	(revision 7cc3bf0a1c503019da5c957de4803dcb54c431ee)
@@ -36,6 +36,15 @@
 			text-align: right;
 		}
 		
+		.gallery-walk-rating-comment-container {
+			width: 60%;
+			margin: auto;
+		}
+		
+		.gallery-walk-rating-comment-container textarea {
+			margin-bottom: 20px;
+		}
+		
 		#gallery-walk-preview-info {
 			margin-bottom: 20px;
 		}
@@ -57,6 +66,9 @@
 			MIN_RATES = 0,
 			LAMS_URL = '${lams}',
 			COUNT_RATED_ITEMS = true,
+			COMMENTS_MIN_WORDS_LIMIT = 0,
+			COMMENT_TEXTAREA_TIP_LABEL = '<fmt:message key="label.comment.textarea.tip"/>',
+			WARN_COMMENTS_IS_BLANK_LABEL = '<fmt:message key="warning.comment.blank"/>',
 			ALLOW_RERATE = true,
 			SESSION_ID = ${toolSessionID};
 			
@@ -164,8 +176,10 @@
 		       	    role="tabpanel" aria-labelledby="heading${groupSummary.sessionId}">
 					<%-- Do not show rating to own group before Gallery Walk is finished --%>
 		       	    <c:if test="${not whiteboard.galleryWalkReadOnly and (whiteboard.galleryWalkFinished or mode == 'teacher' or toolSessionID != groupSummary.sessionId)}">
-		       	    	<lams:Rating itemRatingDto="${groupSummary.itemRatingDto}"
-								     isItemAuthoredByUser="${whiteboard.galleryWalkFinished or not hasEditRight or mode == 'teacher'}" />
+		       	    	<div class="gallery-walk-rating-comment-container">
+		       	    		<lams:Rating itemRatingDto="${groupSummary.itemRatingDto}"
+									     isItemAuthoredByUser="${whiteboard.galleryWalkFinished or not hasEditRight or mode == 'teacher'}" />
+						 </div>
 		       	    </c:if>
 		 
 					<iframe class="whiteboard-frame"