Index: lams_tool_mindmap/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r889137c66c1156153a5e8eaa1e250ae60024fc0a -r7b9c0d5a0c590173997254b7b32196677e9f6a15
--- lams_tool_mindmap/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 889137c66c1156153a5e8eaa1e250ae60024fc0a)
+++ lams_tool_mindmap/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 7b9c0d5a0c590173997254b7b32196677e9f6a15)
@@ -107,9 +107,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.your.group = (Your group)
@@ -124,6 +124,10 @@
 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 = 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.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.comment.textarea.tip = Type your comment here then click on the green tick
 warning.comment.blank = Comment text is missing.
 monitoring.label.group = Group
\ No newline at end of file
Index: lams_tool_mindmap/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r2a724eec0d5174fbd62a4fb21a7248d637f683e0 -r7b9c0d5a0c590173997254b7b32196677e9f6a15
--- lams_tool_mindmap/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 2a724eec0d5174fbd62a4fb21a7248d637f683e0)
+++ lams_tool_mindmap/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 7b9c0d5a0c590173997254b7b32196677e9f6a15)
@@ -6,20 +6,17 @@
 <link type="text/css" href="${lams}/css/jquery-ui-bootstrap-theme.css" rel="stylesheet">
 <link type="text/css" href="${lams}/css/jquery-ui.timepicker.css" rel="stylesheet">
 <style>
-	#control-buttons {
-		text-align: right;
+	#gallery-walk-panel {
+		width: 400px;
+		margin: auto;
+		margin-bottom: 20px;
+		text-align: center;
 	}
 	
-	#gallery-walk-start {
-		margin-left: 20px;
+	#gallery-walk-learner-edit {
+		margin-top: 20px;
 	}
 	
-	#gallery-walk-rating-table {
-		width: 60%;
-		margin: 50px auto;
-		border-bottom: 1px solid #ddd;
-	}
-	
 	#gallery-walk-rating-table th {
 		font-weight: bold;
 		font-style: normal;
@@ -106,8 +103,7 @@
 				toolContentID : ${dto.toolContentId}
 			},
 			'success' : function(){
-				$('#gallery-walk-start').hide();
-				$('#gallery-walk-finish, #gallery-walk-learner-edit').removeClass('hidden');
+				location.reload();
 			}
 		});
 	}
@@ -163,54 +159,77 @@
 </div>
 	
 <c:if test="${not empty dto.sessionDTOs and mindmapDTO.galleryWalkEnabled}">
-	<div id="control-buttons">
-		<button id="gallery-walk-start" type="button"
-		        class="btn btn-default 
-		        	   ${not mindmapDTO.galleryWalkStarted and not mindmapDTO.galleryWalkFinished ? '' : 'hidden'}"
-		        onClick="javascript:startGalleryWalk()">
-			<fmt:message key="monitoring.summary.gallery.walk.start" /> 
-		</button>
-		
-		<button id="gallery-walk-learner-edit" type="button"
-		        class="btn btn-default ${not mindmapDTO.galleryWalkEditEnabled and (mindmapDTO.galleryWalkStarted or mindmapDTO.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 ${mindmapDTO.galleryWalkStarted and not mindmapDTO.galleryWalkFinished ? '' : 'hidden'}"
-		        onClick="javascript:finishGalleryWalk()">
-			<fmt:message key="monitoring.summary.gallery.walk.finish" /> 
-		</button>
+	<div class="panel panel-default" 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 mindmapDTO.galleryWalkStarted and not mindmapDTO.galleryWalkFinished}">
+						<fmt:message key="label.gallery.walk.state.not.started" />
+					</c:when>
+					<c:when test="${mindmapDTO.galleryWalkStarted and not mindmapDTO.galleryWalkFinished}">
+						<fmt:message key="label.gallery.walk.state.started" />
+					</c:when>
+					<c:when test="${mindmapDTO.galleryWalkFinished}">
+						<fmt:message key="label.gallery.walk.state.finished" />
+					</c:when>
+				</c:choose>
+				<c:if test="${mindmapDTO.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 mindmapDTO.galleryWalkStarted and not mindmapDTO.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 ${mindmapDTO.galleryWalkStarted and not mindmapDTO.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 mindmapDTO.galleryWalkEditEnabled and (mindmapDTO.galleryWalkStarted or mindmapDTO.galleryWalkFinished) ? '' : 'hidden'}"
+			        onClick="javascript:enableGalleryWalkLearnerEdit()">
+				<fmt:message key="monitoring.summary.gallery.walk.learner.edit" /> 
+			</button>
+			
+			<c:if test="${mindmapDTO.galleryWalkFinished and not mindmapDTO.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="mindmapSession" items="${mindmapDTO.sessionDTOs}">
+						<tr>
+							<td>${mindmapSession.sessionName}</td>
+							<td>
+								<lams:Rating itemRatingDto="${mindmapSession.itemRatingDto}" 
+											 isItemAuthoredByUser="true"
+											 hideCriteriaTitle="true" />
+							</td>
+						</tr>
+					</c:forEach>
+				  </tbody>
+				</table>
+			</c:if>
+	  </div>
 	</div>
-	
-	<br>
 </c:if>
 
-<c:if test="${mindmapDTO.galleryWalkFinished and not mindmapDTO.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="mindmapSession" items="${mindmapDTO.sessionDTOs}">
-				<tr>
-					<td>${mindmapSession.sessionName}</td>
-					<td>
-						<lams:Rating itemRatingDto="${mindmapSession.itemRatingDto}" 
-									 isItemAuthoredByUser="true"
-									 hideCriteriaTitle="true" />
-					</td>
-				</tr>
-			</c:forEach>
-		  </tbody>
-		</table>
-	</c:if>
-	
 <c:if test="${isGroupedActivity}">
 	<div class="panel-group" id="accordionSessions" role="tablist" aria-multiselectable="true"> 
 </c:if>