Index: lams_learning/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r2d9cfa9d7527e4e21780f5a11da3a7e961eeab05 -r5b29d2ec94e51933e89af2401bc85f83d42307af
--- lams_learning/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 2d9cfa9d7527e4e21780f5a11da3a7e961eeab05)
+++ lams_learning/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 5b29d2ec94e51933e89af2401bc85f83d42307af)
@@ -16,8 +16,8 @@
 message.activity.parallel.partialComplete  =You have to complete the other task before progressing to the next activity....
 message.activity.parallel.noFrames  =Your browser does not handle frames!
 message.activity.options.noActivitySelected  =Please select an activity from the list
-message.activity.options.activityCount  =You must complete at least {0} out of {1} activities to finish.
-message.activity.options.note  =Note: Once you finish any of the above activities you can revisit them by using the progress bar or by clicking or by clicking on the activity name shown above.
+message.activity.options.activityCount  =You must complete at least {0} activities to finish.
+message.activity.options.note  =Note: You can revisit started or finished activities by using the progress bar or by clicking on the activity name shown below.
 label.activity.options.choose  =Choose
 label.synch.gate.title  =Synch gate
 label.synch.gate.message  =You have stopped at a gate. You cannot continue until all of your group/class reach this point.
@@ -60,10 +60,10 @@
 label.sequence.empty.message  =There are no activities to complete in this part of the lesson. Click Next to continue.
 label.my.progress  =My Progress
 label.resume  =Resume
-message.activity.options.note.maximum  =Note: The maximum number of activities you may attempt is {0}. You can revisit started or finished activities by using the progress bar or by clicking on the activity name shown above.
-message.activity.set.options.activityCount  =You must complete at least {0} out of {1} sequences to finish.
-message.activity.set.options.note  =Note: Once you finish any of the above sequences you can revisit them by using the progress bar.
-message.activity.set.options.note.maximum  =Note: The maximum number of sequences you may attempt is {0}. You can revisit started or finished sequences by using the progress bar.
+message.activity.options.note.maximum  =The maximum number of activities you may attempt is {0}.
+message.activity.set.options.activityCount  =You must complete at least {0} sequences to finish.
+message.activity.set.options.note  =Note: You can revisit started or finished sequences by using the progress bar.
+message.activity.set.options.note.maximum  =The maximum number of sequences you may attempt is {0}.
 label.learner.choice.group.full  =Group full
 label.learner.choice.group.message  =Please select a group. Some groups may not be available if they reached the maximum number of members.
 label.choose.group.button  =Choose
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/DisplayOptionsActivityController.java
===================================================================
diff -u -rf4e0bfe05f14ecc966f26ecb6eed46c9a8c59e1e -r5b29d2ec94e51933e89af2401bc85f83d42307af
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/DisplayOptionsActivityController.java	(.../DisplayOptionsActivityController.java)	(revision f4e0bfe05f14ecc966f26ecb6eed46c9a8c59e1e)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/DisplayOptionsActivityController.java	(.../DisplayOptionsActivityController.java)	(revision 5b29d2ec94e51933e89af2401bc85f83d42307af)
@@ -32,6 +32,8 @@
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.log4j.Logger;
+import org.hibernate.Hibernate;
+import org.hibernate.proxy.HibernateProxy;
 import org.lamsfoundation.lams.learning.service.ILearnerFullService;
 import org.lamsfoundation.lams.learning.web.form.OptionsActivityForm;
 import org.lamsfoundation.lams.learning.web.util.ActivityMapping;
@@ -85,22 +87,32 @@
 	List<ActivityURL> activityURLs = new ArrayList<>();
 	Set<Activity> optionsChildActivities = optionsActivity.getActivities();
 	Iterator<Activity> i = optionsChildActivities.iterator();
-	int completedCount = 0;
+	int completedActivitiesCount = 0;
 	while (i.hasNext()) {
 	    Activity optionsChildActivity = i.next();
 	    ActivityURL activityURL = LearningWebUtil.getActivityURL(activityMapping, learnerProgress, optionsChildActivity, false,
 		    false);
 
 	    if (activityURL.isComplete()) {
-		completedCount++;
+		completedActivitiesCount++;
 
 		//create list of activityURLs of all children activities
-		if (optionsChildActivity instanceof SequenceActivity) {
+		if (optionsChildActivity.isSequenceActivity()) {
 		    activityURL.setUrl(null);
 		    
+		    // activity is loaded as proxy due to lazy loading and in order to prevent quering DB we just re-initialize
+		    // it here again
+		    SequenceActivity optionsChildActivityInit;
+		    Hibernate.initialize(activity);
+		    if (optionsChildActivity instanceof HibernateProxy) {
+			optionsChildActivityInit = (SequenceActivity) ((HibernateProxy) optionsChildActivity).getHibernateLazyInitializer()
+				.getImplementation();
+		    } else {
+			optionsChildActivityInit = (SequenceActivity) optionsChildActivity;
+		    }
+		    
 		    List<ActivityURL> childActivities = new ArrayList<>();
-		    Set<Activity> sequenceChildActivities = ((SequenceActivity) optionsChildActivity).getActivities();
-		    for (Activity sequenceChildActivity : sequenceChildActivities) {
+		    for (Activity sequenceChildActivity : optionsChildActivityInit.getActivities()) {
 			ActivityURL sequenceActivityURL = LearningWebUtil.getActivityURL(activityMapping,
 				learnerProgress, sequenceChildActivity, false, false);
 			childActivities.add(sequenceActivityURL);
@@ -112,16 +124,22 @@
 	}
 	form.setActivityURLs(activityURLs);
 
-	if (optionsActivity.getMinNumberOfOptionsNotNull().intValue() <= completedCount) {
-	    form.setFinished(true);
+	if (completedActivitiesCount >= optionsActivity.getMinNumberOfOptionsNotNull().intValue()) {
+	    form.setMinimumLimitReached(true);
 	}
+	
+	if (completedActivitiesCount > 0) {
+	    form.setHasCompletedActivities(true);
+	}
 
-	if (completedCount >= optionsActivity.getMaxNumberOfOptionsNotNull().intValue()) {
+	if (completedActivitiesCount >= optionsActivity.getMaxNumberOfOptionsNotNull().intValue()) {
 	    form.setMaxActivitiesReached(true);
 	}
 
-	form.setMinimum(optionsActivity.getMinNumberOfOptionsNotNull().intValue());
-	form.setMaximum(optionsActivity.getMaxNumberOfOptionsNotNull().intValue());
+	int minNumberOfOptions = optionsActivity.getMinNumberOfOptions() == null ? 0 : optionsActivity.getMinNumberOfOptions();
+	form.setMinimum(minNumberOfOptions);
+	int maxNumberOfOptions = optionsActivity.getMaxNumberOfOptions() == null ? 0 : optionsActivity.getMaxNumberOfOptions();
+	form.setMaximum(maxNumberOfOptions);
 	form.setDescription(optionsActivity.getDescription());
 	form.setTitle(optionsActivity.getTitle());
 	form.setLessonID(learnerProgress.getLesson().getLessonId());
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/form/OptionsActivityForm.java
===================================================================
diff -u -r1f7150d6142f994d113ba543736a9f7c0e154337 -r5b29d2ec94e51933e89af2401bc85f83d42307af
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/form/OptionsActivityForm.java	(.../OptionsActivityForm.java)	(revision 1f7150d6142f994d113ba543736a9f7c0e154337)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/form/OptionsActivityForm.java	(.../OptionsActivityForm.java)	(revision 5b29d2ec94e51933e89af2401bc85f83d42307af)
@@ -25,17 +25,15 @@
 
 /**
  * @author daveg
- *
- *         XDoclet definition:
- *
  */
 public class OptionsActivityForm extends ActivityForm {
 
     private String title;
     private String description;
     private int minimum;
     private int maximum;
-    private boolean finished;
+    private boolean minimumLimitReached;
+    private boolean hasCompletedActivities;
     private Long progressID;
     private boolean maxActivitiesReached;
 
@@ -71,14 +69,22 @@
 	this.maximum = maximum;
     }
 
-    public boolean isFinished() {
-	return finished;
+    public boolean isMinimumLimitReached() {
+	return minimumLimitReached;
     }
 
-    public void setFinished(boolean finished) {
-	this.finished = finished;
+    public void setMinimumLimitReached(boolean minimumLimitReached) {
+	this.minimumLimitReached = minimumLimitReached;
     }
+    
+    public boolean isHasCompletedActivities() {
+	return hasCompletedActivities;
+    }
 
+    public void setHasCompletedActivities(boolean hasCompletedActivities) {
+	this.hasCompletedActivities = hasCompletedActivities;
+    }
+
     public Long getProgressID() {
 	return progressID;
     }
Index: lams_learning/web/optionsActivity.jsp
===================================================================
diff -u -rd5035b7b9e57dd7fc603cc9e1bdace30bf64acc2 -r5b29d2ec94e51933e89af2401bc85f83d42307af
--- lams_learning/web/optionsActivity.jsp	(.../optionsActivity.jsp)	(revision d5035b7b9e57dd7fc603cc9e1bdace30bf64acc2)
+++ lams_learning/web/optionsActivity.jsp	(.../optionsActivity.jsp)	(revision 5b29d2ec94e51933e89af2401bc85f83d42307af)
@@ -35,86 +35,121 @@
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
 	<script type="text/JavaScript">
-			function validate() {
-				var validated = false;
+		function validate() {
+			var validated = false;
 		
-				var form = document.forms[0];
-				var elements = form.elements;
-				for (var i = 0; i < elements.length; i++) {
-					if (elements[i].name == "activityID") {
-						if (elements[i].checked) {
-							validated = true;
-							break;
-						}
+			var form = document.forms[0];
+			var elements = form.elements;
+			for (var i = 0; i < elements.length; i++) {
+				if (elements[i].name == "activityID") {
+					if (elements[i].checked) {
+						validated = true;
+						break;
 					}
 				}
-				if (!validated) {
-					alert("<fmt:message key="message.activity.options.noActivitySelected" />");
-					return false;
-				} else {
-					return true;
-				}
 			}
-			function submitForm(methodName) {
-				var f = document.getElementById('messageForm');
-				f.submit();
+			if (!validated) {
+				alert("<fmt:message key="message.activity.options.noActivitySelected" />");
+				return false;
+			} else {
+				return true;
 			}
+		}
+		function finishActivity() {
+			document.getElementById('messageForm').submit();
+		}
 	</script>
 </lams:head>
 <body class="stripes">
 	<lams:Page type="learner" title="${optionsActivityForm.title}">
 		
-			<c:if test="${not empty optionsActivityForm.description}">
-				<div class="panel">
-					<c:out value="${optionsActivityForm.description}" />
-				</div>
-			</c:if>
+		<c:if test="${not empty optionsActivityForm.description}">
+			<div class="panel">
+				<c:out value="${optionsActivityForm.description}" />
+			</div>
+		</c:if>
+
+		<c:if test="${optionsActivityForm.minimum != 0 && !optionsActivityForm.minimumLimitReached}">
+			<lams:Alert id="min-liimt" close="false" type="danger">	
+				<c:choose>
+					<c:when test="${isOptionsWithSequencesActivity}">
+						<fmt:message key="message.activity.set.options.activityCount">
+							<fmt:param value="${optionsActivityForm.minimum}" />
+						</fmt:message>
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="message.activity.options.activityCount">
+							<fmt:param value="${optionsActivityForm.minimum}" />
+						</fmt:message>
+					</c:otherwise>
+				</c:choose>
+			</lams:Alert>
+		</c:if>
+								
+		<c:if test="${optionsActivityForm.maximum != 0}">
+			<lams:Alert id="max-limit" type="danger" close="false">
+				<c:choose>
+					<c:when test="${isOptionsWithSequencesActivity}">
+						<fmt:message key="message.activity.set.options.note.maximum">
+							<fmt:param value="${optionsActivityForm.maximum}" />
+						</fmt:message>
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="message.activity.options.note.maximum">
+							<fmt:param value="${optionsActivityForm.maximum}" />
+						</fmt:message>
+					</c:otherwise>
+				</c:choose>
+			
+				<c:if test="${optionsActivityForm.maxActivitiesReached}">
+					<c:choose>
+						<c:when test="${isOptionsWithSequencesActivity}">
+							<fmt:message key="label.optional.maxSequencesReached" />
+						</c:when>
+						<c:otherwise>
+							<fmt:message key="label.optional.maxActivitiesReached" />
+						</c:otherwise>
+					</c:choose>
+				</c:if>
+			</lams:Alert>
+		</c:if>
 		
-			<div class="group-box">
+		<c:if test="${optionsActivityForm.hasCompletedActivities}">
+			<lams:Alert id="can-revisit" type="info" close="true">
+				<c:choose>
+					<c:when test="${isOptionsWithSequencesActivity}">
+						<fmt:message key="message.activity.set.options.note" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="message.activity.options.note" />
+					</c:otherwise>
+				</c:choose>
+			</lams:Alert>
+		</c:if>
 		
-				<form:form action="ChooseActivity.do" modelAttribute="activityForm" method="post" onsubmit="return validate();">
-					<input type="hidden" name="lams_token" value="<c:out value='${lams_token}' />">
+		<div class="group-box">
+			<form:form action="ChooseActivity.do" modelAttribute="activityForm" method="post" onsubmit="return validate();">
+				<input type="hidden" name="lams_token" value="<c:out value='${lams_token}' />">
 		
-					<div class="options">
-		
-						<c:if test="${optionsActivityForm.maximum != numActivities or optionsActivityForm.minimum != 0}">
-							<lams:Alert id="options" close="false" type="danger">
-								<c:choose>
-									<c:when test="${isOptionsWithSequencesActivity}">
-										<fmt:message key="message.activity.set.options.activityCount">
-											<fmt:param value="${optionsActivityForm.minimum}" />
-											<fmt:param value="${optionsActivityForm.maximum}" />
-										</fmt:message>
-									</c:when>
-									<c:otherwise>
-										<fmt:message key="message.activity.options.activityCount">
-											<fmt:param value="${optionsActivityForm.minimum}" />
-											<fmt:param value="${optionsActivityForm.maximum}" />
-										</fmt:message>
-									</c:otherwise>
-								</c:choose>
-							</lams:Alert>
-						</c:if>
-		
-						<table class="table table-condensed table-hover">
-						<c:forEach items="${optionsActivityForm.activityURLs}" var="activityURL" varStatus="loop">
+				<div class="options">
+					<table class="table table-condensed table-hover">
+						<c:forEach items="${optionsActivityForm.activityURLs}" var="activityURL">
 							<tr><td>
-								<c:set var="numActivities" value="${loop.count}" />
 
 								<c:choose>
 									<c:when test="${not activityURL.complete and not optionsActivityForm.maxActivitiesReached}">
 										<div class="radio">
 											<label>
 												<input type="radio" name="activityID" class="noBorder" id="activityID-${activityURL.activityId}"
-													value="${activityURL.activityId}">
+													value="${activityURL.activityId}" onchange="$('#choose-branch-button').prop('disabled', false);">
 												<c:out value="${activityURL.title}" />
 											</label>
 										</div>
 									</c:when>
 									
 									<c:when test="${activityURL.complete}">
 										<div class="radio loffset20">
-											<i class="fa fa-lg fa-check text-success radio-button-offset"></i>
+											<i class="fa fa-lg fa-check-circle text-success radio-button-offset" style="cursor: auto;"></i>
 										
 											<c:choose>
 												<c:when test="${not empty activityURL.url}">
@@ -127,111 +162,63 @@
 													</span>
 													
 													<div class="loffset20">
-													<c:forEach items="${activityURL.childActivities}" var="childActivityURL">
-														
-														<a href="${childActivityURL.url}"><c:out value="${childActivityURL.title}" /></a>
-														<br>
-													</c:forEach>
+														<c:forEach items="${activityURL.childActivities}" var="childActivityURL">
+															<a href="${childActivityURL.url}"><c:out value="${childActivityURL.title}" /></a>
+															<br>
+														</c:forEach>
 													</div>
 												</c:when>
 											</c:choose>										
 										</div>
 									</c:when>
 											
 									<c:otherwise>
-										<div class="loffset20">
+										<div class="radio loffset20">
 											<c:out value="${activityURL.title}" />
 										</div>
 									</c:otherwise>
 								</c:choose>
 							</td></tr>
 						</c:forEach>
-						</table>
-					</div>
+					</table>
+				</div>
 		
-					<div align="center" class="voffset10">
-						<c:choose>
-							<c:when test="${optionsActivityForm.maxActivitiesReached}">
-								<c:choose>
-									<c:when test="${isOptionsWithSequencesActivity}">
-										<lams:Alert id="limits" type="info" close="false">
-											<fmt:message key="label.optional.maxSequencesReached" />
-										</lams:Alert>
-									</c:when>
-									<c:otherwise>
-										<lams:Alert id="maxReached" type="danger" close="false">
-											<fmt:message key="label.optional.maxActivitiesReached" />
-										</lams:Alert>
-									</c:otherwise>
-								</c:choose>
+				<div align="center" class="voffset10">
+					<c:if test="${!optionsActivityForm.maxActivitiesReached}">
+						<button id="choose-branch-button" class="btn btn-default" disabled="disabled">
+							<fmt:message key="label.activity.options.choose" />
+						</button>						
+					</c:if>
+				</div>
 		
-							</c:when>
-							<c:otherwise>
-								<button class="btn btn-default">
-									<fmt:message key="label.activity.options.choose" />
-								</button>
-							</c:otherwise>
-						</c:choose>
-					</div>
+			</form:form>
+		</div>
 		
-				</form:form>
-			</div>
+		<c:if test="${optionsActivityForm.minimumLimitReached}">
+			<form:form action="/lams/learning/CompleteActivity.do" modelAttribute="messageForm" method="post" id="messageForm">
+				<input type="hidden" name="lams_token" value="<c:out value='${lams_token}' />">
+				<input type="hidden" name="activityID" value="<c:out value='${optionsActivityForm.activityID}' />">
+				<input type="hidden" name="lessonID" value="<c:out value='${optionsActivityForm.lessonID}' />">
+				<input type="hidden" name="progressID" value="<c:out value='${optionsActivityForm.progressID}' />">
 		
-			<c:if test="${optionsActivityForm.finished}">
-				<form:form action="/lams/learning/CompleteActivity.do" modelAttribute="messageForm" method="post" id="messageForm">
-					<input type="hidden" name="lams_token" value="<c:out value='${lams_token}' />">
-					<input type="hidden" name="activityID" value="<c:out value='${optionsActivityForm.activityID}' />">
-					<input type="hidden" name="lessonID" value="<c:out value='${optionsActivityForm.lessonID}' />">
-					<input type="hidden" name="progressID" value="<c:out value='${optionsActivityForm.progressID}' />">
+				<hr class="msg-hr">
 		
-					<p class="voffset10 help-text">
+				<div class="voffset10">
+					<a href="javascript:;" class="btn btn-primary pull-right na" id="finishButton"
+						onclick="finishActivity()">
 						<c:choose>
-							<c:when test="${optionsActivityForm.maximum gt 0 and optionsActivityForm.maximum lt numActivities}">
-								<c:choose>
-									<c:when test="${isOptionsWithSequencesActivity}">
-										<fmt:message key="message.activity.set.options.note.maximum">
-											<fmt:param value="${optionsActivityForm.maximum}" />
-										</fmt:message>
-									</c:when>
-									<c:otherwise>
-										<fmt:message key="message.activity.options.note.maximum">
-											<fmt:param value="${optionsActivityForm.maximum}" />
-										</fmt:message>
-									</c:otherwise>
-								</c:choose>
+							<c:when test="${activityPosition.last}">
+								<fmt:message key="label.submit.button" />
 							</c:when>
 							<c:otherwise>
-								<c:choose>
-									<c:when test="${isOptionsWithSequencesActivity}">
-										<fmt:message key="message.activity.set.options.note" />
-									</c:when>
-									<c:otherwise>
-										<fmt:message key="message.activity.options.note" />
-									</c:otherwise>
-								</c:choose>
+								<fmt:message key="label.finish.button" />
 							</c:otherwise>
 						</c:choose>
-					</p>
+					</a>
+				</div>
 		
-		
-					<hr class="msg-hr">
-		
-					<div class="voffset10">
-						<a href="javascript:;" class="btn btn-primary pull-right na" id="finishButton"
-							onclick="submitForm('finish')">
-							<c:choose>
-								<c:when test="${activityPosition.last}">
-									<fmt:message key="label.submit.button" />
-								</c:when>
-								<c:otherwise>
-									<fmt:message key="label.finish.button" />
-								</c:otherwise>
-							</c:choose>
-						</a>
-					</div>
-		
-				</form:form>
-			</c:if>
+			</form:form>
+		</c:if>
 			
 	</lams:Page>
 </body>