Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/LearningController.java
===================================================================
diff -u -r694dd2c529990a94c17576dce6c98e5b821532e0 -r53f4a7bfa1d8d27ed32727c581a18b53eb5334f5
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/LearningController.java	(.../LearningController.java)	(revision 694dd2c529990a94c17576dce6c98e5b821532e0)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/LearningController.java	(.../LearningController.java)	(revision 53f4a7bfa1d8d27ed32727c581a18b53eb5334f5)
@@ -151,7 +151,7 @@
 	// save toolContentID into HTTPSession
 	ToolAccessMode mode = WebUtil.readToolAccessModeParam(request, AttributeNames.PARAM_MODE, true);
 
-	Long sessionId = new Long(request.getParameter(ResourceConstants.PARAM_TOOL_SESSION_ID));
+	Long sessionId = WebUtil.readLongParam(request, ResourceConstants.PARAM_TOOL_SESSION_ID);
 
 	request.setAttribute(ResourceConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
 	request.setAttribute(AttributeNames.ATTR_MODE, mode);
@@ -257,6 +257,7 @@
 	}
 	sessionMap.put(ResourceConstants.ATTR_COMPLETED_SUFFICIENT_TO_FINISH,
 		numItemsCompleted >= resource.getMiniViewResourceNumber());
+	request.setAttribute("itemsComplete", numItemsCompleted);
 
 	sessionMap.put(ResourceConstants.ATTR_RESOURCE, resource);
 	return "pages/learning/learning";
Index: lams_tool_larsrc/web/pages/learning/learning.jsp
===================================================================
diff -u -r0c5d2aefd17a667d8222d8f1bb8b05aa4034ed10 -r53f4a7bfa1d8d27ed32727c581a18b53eb5334f5
--- lams_tool_larsrc/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 0c5d2aefd17a667d8222d8f1bb8b05aa4034ed10)
+++ lams_tool_larsrc/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 53f4a7bfa1d8d27ed32727c581a18b53eb5334f5)
@@ -87,6 +87,8 @@
 	<lams:JSImport src="learning/includes/javascript/gate-check.js" />
 	<script>
 		checkNextGateActivity('finishButton', '${toolSessionID}', '', finishSession);
+
+		let itemsComplete = ${itemsComplete};
 	
 		$(document).ready(function(){
 			cancel();
@@ -178,6 +180,12 @@
 					alert('Error while marking item as complete.\nStatus: ' + textStatus + '\nError: ' + errorThrown);
 				},
 				success:  function() {
+					itemsComplete++;
+					if (itemsComplete >= ${resource.miniViewResourceNumber}) {
+						checkNew();
+						return;
+					}
+					
 					let heading = $('#heading' + itemUid);
 					$('.complete-item-button', heading).remove();
 					$('.icon-complete', heading).removeClass('hidden');
@@ -321,17 +329,17 @@
 								<c:when test="${item.complete}">
 									<i class="fa fa-check icon-complete" title='<fmt:message key="label.completed" />'></i>
 								</c:when>
-								<c:otherwise>
+								<c:when test="${not finishedLock}">
 									<i class="fa fa-check icon-complete hidden" title='<fmt:message key="label.completed" />'></i>
 									<button type="button" onClick="javascript:completeItem(${item.uid})"
 										   class="complete-item-button btn btn-xs btn-default">
 										<fmt:message key='label.finish' />
 									</button>
-								</c:otherwise>
+								</c:when>
 							</c:choose>
 							
 							
-							<c:if test="${!item.createByAuthor && userID == item.createBy.userId}">
+							<c:if test="${not finishedLock && !item.createByAuthor && userID == item.createBy.userId}">
 								<i class="fa fa-trash delete-item-button"
 								   title="<fmt:message key="label.delete" />"
 								   onclick="hideItem(${item.uid})"></i>