Index: lams_tool_doku/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r4a6be45d5c1bbf95b3441d7e152dcb94b52284c1 -r40d35bcff105ae1e4eb2a5ab7af512403b3f3bf5
--- lams_tool_doku/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 4a6be45d5c1bbf95b3441d7e152dcb94b52284c1)
+++ lams_tool_doku/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 40d35bcff105ae1e4eb2a5ab7af512403b3f3bf5)
@@ -100,9 +100,9 @@
 label.authoring.advance.gallery.walk.instructions =  Instructions for Gallery Walk (ie: Please review other groups' work and make sure you add your review/comments)
 label.authoring.advance.gallery.walk.read.only.tooltip = Students will not be able to neither comment on nor rate other teams' work.
 monitoring.summary.gallery.walk.start = Start Gallery Walk
-monitoring.summary.gallery.walk.start.confirm = Are you sure you want to finish collaboration phase and start Gallery Walk?
+monitoring.summary.gallery.walk.start.confirm = Are you sure you want to finish collaboration phase and start Gallery Walk? You will not be able to return to collaboration phase.
 monitoring.summary.gallery.walk.finish = Finish Gallery Walk
-monitoring.summary.gallery.walk.finish.confirm = Are you sure you want to finish Gallery Walk?
+monitoring.summary.gallery.walk.finish.confirm = Are you sure you want to finish Gallery Walk? You will not be able to restart Gallery Walk.
 monitoring.summary.gallery.walk.learner.edit = Let learners modify answers
 monitoring.summary.gallery.walk.learner.edit.confirm = Are you sure you want allows students to modify their answers while inside Gallery Walk?
 label.gallery.walk = Gallery Walk
@@ -117,6 +117,10 @@
 label.gallery.walk.wait.start.preview = Continue to Gallery Walk. Since you are in preview mode, you can do it immediately. Regular learners get this message would need to wait for a teacher to start Gallery Walk on monitoring screen.
 label.gallery.walk.wait.finish.preview = Continue to Gallery Walk summary. Since you are in preview mode, you can do it immediately. Regular learners get this message would need to wait for a teacher to finish Gallery Walk on monitoring screen.
 label.gallery.walk.preview = You are in preview mode. You only see your own group. Regular learners would see other groups' work and would be able to comment on it and rate it.
+label.gallery.walk.state.not.started = not started
+label.gallery.walk.state.started = started
+label.gallery.walk.state.finished = finished
+label.gallery.walk.state.learner.edit.enabled = , learners can modify answers
 label.monitoring.change.leader = Change leader
 label.monitoring.leader.successfully.changed = Leader changed
 label.monitoring.leader.not.changed = Leader was not changed
Index: lams_tool_doku/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r31261a5f8d336b5543df5356acc233df8219e714 -r40d35bcff105ae1e4eb2a5ab7af512403b3f3bf5
--- lams_tool_doku/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 31261a5f8d336b5543df5356acc233df8219e714)
+++ lams_tool_doku/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 40d35bcff105ae1e4eb2a5ab7af512403b3f3bf5)
@@ -100,9 +100,11 @@
 label.authoring.advance.gallery.walk.instructions =  Instructions for Gallery Walk (ie: Please review other groups' work and make sure you add your review/comments)
 label.authoring.advance.gallery.walk.read.only.tooltip = Students will not be able to neither comment on nor rate other teams' work.
 monitoring.summary.gallery.walk.start = Start Gallery Walk
-monitoring.summary.gallery.walk.start.confirm = Are you sure you want to finish collaboration phase and start Gallery Walk?
+monitoring.summary.gallery.walk.start.confirm = Are you sure you want to finish collaboration phase and start Gallery Walk? You will not be able to return to collaboration phase.
 monitoring.summary.gallery.walk.finish = Finish Gallery Walk
-monitoring.summary.gallery.walk.finish.confirm = Are you sure you want to finish Gallery Walk?
+monitoring.summary.gallery.walk.finish.confirm = Are you sure you want to finish Gallery Walk? You will not be able to restart Gallery Walk.
+monitoring.summary.gallery.walk.learner.edit = Let learners modify answers
+monitoring.summary.gallery.walk.learner.edit.confirm = Are you sure you want allows students to modify their answers while inside Gallery Walk?
 label.gallery.walk = Gallery Walk
 label.gallery.walk.wait.finish = The Gallery Walk activity has not been set as completed by the teacher. If you have completed, please contact the teacher for assistance.
 label.rating = Rating
@@ -115,6 +117,10 @@
 label.gallery.walk.wait.start.preview = Continue to Gallery Walk. Since you are in preview mode, you can do it immediately. Regular learners get this message would need to wait for a teacher to start Gallery Walk on monitoring screen.
 label.gallery.walk.wait.finish.preview = Continue to Gallery Walk summary. Since you are in preview mode, you can do it immediately. Regular learners get this message would need to wait for a teacher to finish Gallery Walk on monitoring screen.
 label.gallery.walk.preview = You are in preview mode. You only see your own group. Regular learners would see other groups' work and would be able to comment on it and rate it.
+label.gallery.walk.state.not.started = not started
+label.gallery.walk.state.started = started
+label.gallery.walk.state.finished = finished
+label.gallery.walk.state.learner.edit.enabled = , learners can modify answers
 label.monitoring.change.leader = Change leader
 label.monitoring.leader.successfully.changed = Leader changed
 label.monitoring.leader.not.changed = Leader was not changed
Index: lams_tool_doku/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r4a6be45d5c1bbf95b3441d7e152dcb94b52284c1 -r40d35bcff105ae1e4eb2a5ab7af512403b3f3bf5
--- lams_tool_doku/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 4a6be45d5c1bbf95b3441d7e152dcb94b52284c1)
+++ lams_tool_doku/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 40d35bcff105ae1e4eb2a5ab7af512403b3f3bf5)
@@ -27,20 +27,21 @@
 	.doku-monitoring-summary .panel {
 		overflow: auto;
 	}
-	
-	.doku-monitoring-summary #control-buttons {
-		float: right;
+
+	.doku-monitoring-summary #gallery-walk-panel {
+		width: 30%;
+		margin: auto;
 		margin-bottom: 20px;
+		text-align: center;
 	}
 	
-	.doku-monitoring-summary #gallery-walk-start {
-		margin-left: 20px;
+	.doku-monitoring-summary #gallery-walk-panel.gallery-walk-panel-ratings {
+		width: 100%;
 	}
 	
-	.doku-monitoring-summary #gallery-walk-rating-table {
-		width: 60%;
-		margin: 50px auto;
-		border-bottom: 1px solid #ddd;
+	.doku-monitoring-summary #gallery-walk-learner-edit {
+		margin-top: 20px;
+		margin-bottom: 20px;
 	}
 	
 	.doku-monitoring-summary #gallery-walk-rating-table th {
@@ -312,10 +313,15 @@
 				toolContentID : ${dokumaran.contentId}
 			},
 			'success' : function(){
-				let summaryPane = $('#doku-monitoring-summary-${sessionMap.toolContentID}');
-				
-				$('#gallery-walk-start', summaryPane).hide();
-				$('#gallery-walk-finish, #gallery-walk-learner-edit', summaryPane).removeClass('hidden');
+				<c:choose>
+					<c:when test="${isTbl}">
+						// reload current tab with Doku summary
+						loadTab(null, null, false);
+					</c:when>
+					<c:otherwise>
+						location.reload();
+					</c:otherwise>
+				</c:choose>
 			}
 		});
 	}
@@ -332,9 +338,6 @@
 			},
 			'success' : function(){
 				<c:choose>
-					<c:when test="${dokumaran.galleryWalkReadOnly}">
-						$('#doku-monitoring-summary-${sessionMap.toolContentID} #gallery-walk-finish').hide();
-					</c:when>
 					<c:when test="${isTbl}">
 						// reload current tab with Doku summary
 						loadTab(null, null, false);
@@ -773,55 +776,79 @@
 		<!--For release marks feature-->
 		<i class="fa fa-spinner" style="display:none" id="message-area-busy"></i>
 		<div id="message-area"></div>
+	</div>
 	
-		<c:if test="${not empty summaryList and dokumaran.galleryWalkEnabled}">
-			<div id="control-buttons">
-				<button id="gallery-walk-start" type="button"
-				        class="btn btn-default 
+	<c:if test="${not empty summaryList and dokumaran.galleryWalkEnabled}">
+		<div class="panel panel-default ${dokumaran.galleryWalkFinished and not dokumaran.galleryWalkReadOnly ? 'gallery-walk-panel-ratings' : ''}"
+			 id="gallery-walk-panel">
+		  <div class="panel-heading">
+		    <h3 class="panel-title">
+				<fmt:message key="label.gallery.walk" />&nbsp;
+				<b>
+					<c:choose>
+						<c:when test="${not dokumaran.galleryWalkStarted and not dokumaran.galleryWalkFinished}">
+							<fmt:message key="label.gallery.walk.state.not.started" />
+						</c:when>
+						<c:when test="${dokumaran.galleryWalkStarted and not dokumaran.galleryWalkFinished}">
+							<fmt:message key="label.gallery.walk.state.started" />
+						</c:when>
+						<c:when test="${dokumaran.galleryWalkFinished}">
+							<fmt:message key="label.gallery.walk.state.finished" />
+						</c:when>
+					</c:choose>
+					<c:if test="${dokumaran.galleryWalkEditEnabled}">
+						<fmt:message key="label.gallery.walk.state.learner.edit.enabled" />
+					</c:if>
+				</b>
+			</h3>
+		  </div>
+		  <div class="panel-body">
+		   		<button id="gallery-walk-start" type="button"
+				        class="btn btn-primary
 				        	   ${not dokumaran.galleryWalkStarted and not dokumaran.galleryWalkFinished ? '' : 'hidden'}"
 				        onClick="javascript:startGalleryWalk()">
 					<fmt:message key="monitoring.summary.gallery.walk.start" /> 
 				</button>
-								
+				
+				<button id="gallery-walk-finish" type="button"
+				        class="btn btn-primary ${dokumaran.galleryWalkStarted and not dokumaran.galleryWalkFinished ? '' : 'hidden'}"
+				        onClick="javascript:finishGalleryWalk()">
+					<fmt:message key="monitoring.summary.gallery.walk.finish" /> 
+				</button>
+				
+				<br>
+							
 				<button id="gallery-walk-learner-edit" type="button"
 				        class="btn btn-default ${not dokumaran.galleryWalkEditEnabled and (dokumaran.galleryWalkStarted or dokumaran.galleryWalkFinished) ? '' : 'hidden'}"
 				        onClick="javascript:enableGalleryWalkLearnerEdit()">
 					<fmt:message key="monitoring.summary.gallery.walk.learner.edit" /> 
 				</button>
 				
-				<button id="gallery-walk-finish" type="button"
-				        class="btn btn-default ${dokumaran.galleryWalkStarted and not dokumaran.galleryWalkFinished ? '' : 'hidden'}"
-				        onClick="javascript:finishGalleryWalk()">
-					<fmt:message key="monitoring.summary.gallery.walk.finish" /> 
-				</button>
-			</div>
-			
-			<br>
-		</c:if>
-	</div>
-
-	<c:if test="${dokumaran.galleryWalkFinished and not dokumaran.galleryWalkReadOnly}">
-		<h4 class="voffset20" style="text-align: center"><fmt:message key="label.gallery.walk.ratings.header" /></h4>
-		<table id="gallery-walk-rating-table" class="table table-hover table-condensed">
-		  <thead class="thead-light">
-		    <tr>
-		      <th scope="col"><fmt:message key="monitoring.label.group" /></th>
-		      <th scope="col"><fmt:message key="label.rating" /></th>
-		    </tr>
-		  </thead>
-		  <tbody>
-			<c:forEach var="groupSummary" items="${summaryList}">
-				<tr>
-					<td>${groupSummary.sessionName}</td>
-					<td>
-						<lams:Rating itemRatingDto="${groupSummary.itemRatingDto}" 
-									 isItemAuthoredByUser="true"
-									 hideCriteriaTitle="true" />
-					</td>
-				</tr>
-			</c:forEach>
-		  </tbody>
-		</table>
+				<c:if test="${dokumaran.galleryWalkFinished and not dokumaran.galleryWalkReadOnly}">
+					<h4 style="text-align: center"><fmt:message key="label.gallery.walk.ratings.header" /></h4>
+					<table id="gallery-walk-rating-table" class="table table-hover table-condensed">
+					  <thead class="thead-light">
+					    <tr>
+					      <th scope="col"><fmt:message key="monitoring.label.group" /></th>
+					      <th scope="col"><fmt:message key="label.rating" /></th>
+					    </tr>
+					  </thead>
+					  <tbody>
+						<c:forEach var="groupSummary" items="${summaryList}">
+							<tr>
+								<td>${groupSummary.sessionName}</td>
+								<td>
+									<lams:Rating itemRatingDto="${groupSummary.itemRatingDto}" 
+												 isItemAuthoredByUser="true"
+												 hideCriteriaTitle="true" />
+								</td>
+							</tr>
+						</c:forEach>
+					  </tbody>
+					</table>
+				</c:if>
+		  </div>
+		</div>
 	</c:if>
 	
 	<c:if test="${sessionMap.isGroupedActivity}">