Index: lams_tool_preview/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r609767222710b5960b019fdb34908f682554935e -rcff1f4709263aa5513ac0b4f5fd239a1390d905b
--- lams_tool_preview/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 609767222710b5960b019fdb34908f682554935e)
+++ lams_tool_preview/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision cff1f4709263aa5513ac0b4f5fd239a1390d905b)
@@ -47,15 +47,14 @@
 label.continue  =Continue
 message.no.reflection.available  =No notebook available
 message.alertContentEdit  =Warning: One of more learners have accessed this activity. Changing this content will result in learners getting different information.
-message.warnLockOnFinish  =Note: After you click on "Next Activity", if you come back to this Peer Review, you will not be able to rate new users.
+message.warnLockOnFinish  =Note: After you click on {0}, if you come back to this Peer Review, you will not be able to rate new users.
 message.activityLocked  =The instructor has set this activity not to allow you to view or rate any more users after you have finished it.
 label.export.reflection  =Notebook Entries
 label.on  =On
 label.off  =Off
 monitor.summary.th.advancedSettings  =Advanced settings
 monitor.summary.td.addNotebook  =Add a notebook at end of Peer Review
 monitor.summary.td.notebookInstructions  =Notebook instructions
-label.submit  =Finish
 label.monitoring.heading  =Peer Review Monitoring
 label.average.rating  =Average rating {0}/{1} votes
 label.redo  =Redo ratings
Index: lams_tool_preview/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -ra93929c9c7f7f0df676412691f2f8f9d44d201a2 -rcff1f4709263aa5513ac0b4f5fd239a1390d905b
--- lams_tool_preview/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision a93929c9c7f7f0df676412691f2f8f9d44d201a2)
+++ lams_tool_preview/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision cff1f4709263aa5513ac0b4f5fd239a1390d905b)
@@ -48,15 +48,14 @@
 label.continue  =Continue
 message.no.reflection.available  =No notebook available
 message.alertContentEdit  =Warning: One of more learners have accessed this activity. Changing this content will result in learners getting different information.
-message.warnLockOnFinish  =Note: After you click on "Next Activity", if you come back to this Peer Review, you will not be able to rate new users.
+message.warnLockOnFinish  =Note: After you click on {0}, if you come back to this Peer Review, you will not be able to rate new users.
 message.activityLocked  =The instructor has set this activity not to allow you to view or rate any more users after you have finished it.
 label.export.reflection  =Notebook Entries
 label.on  =On
 label.off  =Off
 monitor.summary.th.advancedSettings  =Advanced settings
 monitor.summary.td.addNotebook  =Add a notebook at end of Peer Review
 monitor.summary.td.notebookInstructions  =Notebook instructions
-label.submit  =Finish
 label.monitoring.heading  =Peer Review Monitoring
 label.average.rating  =Average rating {0}/{1} votes
 label.redo  =Redo ratings
Index: lams_tool_preview/web/WEB-INF/tags/TSTable.tag
===================================================================
diff -u -r609767222710b5960b019fdb34908f682554935e -rcff1f4709263aa5513ac0b4f5fd239a1390d905b
--- lams_tool_preview/web/WEB-INF/tags/TSTable.tag	(.../TSTable.tag)	(revision 609767222710b5960b019fdb34908f682554935e)
+++ lams_tool_preview/web/WEB-INF/tags/TSTable.tag	(.../TSTable.tag)	(revision cff1f4709263aa5513ac0b4f5fd239a1390d905b)
@@ -3,7 +3,7 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 
 <%@ attribute name="numColumns" required="true" rtexprvalue="true"%>
-<%@ attribute name="sessionId" required="false" rtexprvalue="true"%>
+<%@ attribute name="dataId" required="false" rtexprvalue="true"%>
 <%@ attribute name="tableClass" required="false" rtexprvalue="true"%>
 <%@ attribute name="pagerClass" required="false" rtexprvalue="true"%>
 <%@ attribute name="test" required="false" rtexprvalue="true"%>
@@ -16,7 +16,11 @@
 	<c:set var="pagerClass" value="ts-pager" />
 </c:if>
 
-<table class="${tableClass}" data-session-id="${sessionId}">
+<c:if test="${empty dataId}">
+	<c:set var="dataId" value="" />
+</c:if>
+
+<table class="${tableClass}" ${dataId}>
 	<thead>
 		<tr>
 			<jsp:doBody />
Index: lams_tool_preview/web/pages/learning/learning.jsp
===================================================================
diff -u -r609767222710b5960b019fdb34908f682554935e -rcff1f4709263aa5513ac0b4f5fd239a1390d905b
--- lams_tool_preview/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 609767222710b5960b019fdb34908f682554935e)
+++ lams_tool_preview/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision cff1f4709263aa5513ac0b4f5fd239a1390d905b)
@@ -10,6 +10,15 @@
 <c:set var="finishedLock" value="${sessionMap.finishedLock}" />
 <c:set var="isCommentsEnabled" value="${sessionMap.isCommentsEnabled}" />
 
+<c:choose>
+	<c:when test="${peerreview.showRatingsLeftForUser}">
+		<c:set var="finishButtonLabel"><fmt:message key="label.continue" /></c:set>
+	</c:when>				
+	<c:otherwise>
+		<c:set var="finishButtonLabel"><fmt:message key="label.finished" /></c:set>
+	</c:otherwise>
+</c:choose>
+
 <lams:html>
 <lams:head>
 	<title><fmt:message key="label.learning.title" /></title>
@@ -231,10 +240,10 @@
 			<lams:Alert type="danger" id="warn-lock" close="false">
 				<c:choose>
 					<c:when test="${sessionMap.userFinished}">
-						<fmt:message key="message.activityLocked" />
+						<fmt:message key="message.activityLocked"/>
 					</c:when>
 					<c:otherwise>
-						<fmt:message key="message.warnLockOnFinish" />
+						<fmt:message key="message.warnLockOnFinish" ><fmt:param>${finishButtonLabel}</fmt:param></fmt:message>
 					</c:otherwise>
 				</c:choose>
 			</lams:Alert>
@@ -320,26 +329,19 @@
 					<fmt:message key="label.refresh" />
 				</html:button>
 				<c:choose>
-					<c:when test="${sessionMap.reflectOn && (not sessionMap.userFinished)}">
-						<html:button property="FinishButton" onclick="return continueReflect()" styleClass="btn btn-primary voffset5 pull-right">
-							<fmt:message key="label.continue" />
-						</html:button>
-					</c:when>
 					<c:when test="${peerreview.showRatingsLeftForUser}">
 						<html:button property="FinishButton" styleId="finishButton" onclick="return showResults()" styleClass="btn btn-primary voffset5 pull-right">
-							<fmt:message key="label.submit" />
+							<fmt:message key="label.continue" />
 						</html:button>
 					</c:when>				
+					<c:when test="${sessionMap.reflectOn && (not sessionMap.userFinished)}">
+						<html:button property="FinishButton" onclick="return continueReflect()" styleClass="btn btn-default voffset5 pull-right">
+							<fmt:message key="label.continue" />
+						</html:button>
+					</c:when>
 					<c:otherwise>
 						<html:link href="#nogo" property="FinishButton" styleId="finishButton" onclick="return finishSession()" styleClass="btn btn-primary voffset5 pull-right na">
-							<c:choose>
-			 					<c:when test="${sessionMap.activityPosition.last}">
-			 						<fmt:message key="label.submit" />
-			 					</c:when>
-			 					<c:otherwise>
-			 		 				<fmt:message key="label.finished" />
-			 					</c:otherwise>
-			 				</c:choose>
+							<fmt:message key="label.finished" />
 						</html:link>
 					</c:otherwise>
 				</c:choose>
Index: lams_tool_preview/web/pages/learning/notebook.jsp
===================================================================
diff -u -rb91f46a77fa9a30a9c970e61ca6a7a868f8dba4d -rcff1f4709263aa5513ac0b4f5fd239a1390d905b
--- lams_tool_preview/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision b91f46a77fa9a30a9c970e61ca6a7a868f8dba4d)
+++ lams_tool_preview/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision cff1f4709263aa5513ac0b4f5fd239a1390d905b)
@@ -1,6 +1,5 @@
 <%@ include file="/common/taglibs.jsp"%>
 <!DOCTYPE html>
-        
 
 <lams:html>
 <lams:head>
@@ -40,14 +39,7 @@
 
 			<div class="space-bottom-top align-right">
 				<html:link href="#nogo" styleClass="btn btn-primary voffset5 pull-right na" styleId="finishButton" onclick="submitForm('finish')">
-						<c:choose>
-		 					<c:when test="${sessionMap.activityPosition.last}">
-		 						<fmt:message key="label.submit" />
-		 					</c:when>
-		 					<c:otherwise>
-		 		 				<fmt:message key="label.finished" />
-		 					</c:otherwise>
-		 				</c:choose>
+					<fmt:message key="label.finished" />
 				</html:link>
 			</div>
 		</lams:Page>
Index: lams_tool_preview/web/pages/learning/results.jsp
===================================================================
diff -u -r609767222710b5960b019fdb34908f682554935e -rcff1f4709263aa5513ac0b4f5fd239a1390d905b
--- lams_tool_preview/web/pages/learning/results.jsp	(.../results.jsp)	(revision 609767222710b5960b019fdb34908f682554935e)
+++ lams_tool_preview/web/pages/learning/results.jsp	(.../results.jsp)	(revision cff1f4709263aa5513ac0b4f5fd239a1390d905b)
@@ -89,10 +89,17 @@
 
 		<c:if test="${sessionMap.lockOnFinish and mode != 'teacher'}">
 			<lams:Alert type="danger" id="warn-lock" close="false">
-				<fmt:message key="message.activityLocked" />
+				<c:choose>
+					<c:when test="${sessionMap.userFinished}">
+						<fmt:message key="message.activityLocked"/>
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="message.warnLockOnFinish" ><fmt:param><fmt:message key="label.finished" /></fmt:param></fmt:message>
+					</c:otherwise>
+				</c:choose>
 			</lams:Alert>
 		</c:if>
-		
+
 		<c:if test="${not empty itemRatingDtos}">
 
 		<!-- Ratings UI -->
@@ -149,21 +156,14 @@
 
 		<c:if test="${mode != 'teacher'}">
 				<c:choose>			
-					<c:when test="${sessionMap.reflectOn && (not sessionMap.isSessionCompleted)}">
-						<html:button property="FinishButton" onclick="return continueReflect()" styleClass="btn btn-primary voffset5 pull-right">
+					<c:when test="${(not sessionMap.isSessionCompleted) and sessionMap.reflectOn}">
+						<html:button property="FinishButton" onclick="return continueReflect()" styleClass="btn btn-default voffset5 pull-right">
 							<fmt:message key="label.continue" />
 						</html:button>
 					</c:when>
 					<c:otherwise>
 						<html:link href="#nogo" property="FinishButton" styleId="finishButton" onclick="return finishSession()" styleClass="btn btn-primary voffset5 pull-right na">
-								<c:choose>
-				 					<c:when test="${sessionMap.activityPosition.last}">
-				 						<fmt:message key="label.submit" />
-				 					</c:when>
-				 					<c:otherwise>
-				 		 				<fmt:message key="label.finished" />
-				 					</c:otherwise>
-				 				</c:choose>
+							<fmt:message key="label.finished" />
 						</html:link>
 					</c:otherwise>
 				</c:choose>