Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/CompleteActivityController.java
===================================================================
diff -u -r815b617ce48bcd3dc0a36aa32630ca55d4c21715 -rc61226d9e999c36d82584f6fe2ed55e8a1545d23
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/CompleteActivityController.java	(.../CompleteActivityController.java)	(revision 815b617ce48bcd3dc0a36aa32630ca55d4c21715)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/CompleteActivityController.java	(.../CompleteActivityController.java)	(revision c61226d9e999c36d82584f6fe2ed55e8a1545d23)
@@ -33,7 +33,6 @@
 import org.lamsfoundation.lams.integration.service.IIntegrationService;
 import org.lamsfoundation.lams.learning.service.ILearnerFullService;
 import org.lamsfoundation.lams.learning.service.LearnerServiceException;
-import org.lamsfoundation.lams.learning.web.form.ActivityForm;
 import org.lamsfoundation.lams.learning.web.util.ActivityMapping;
 import org.lamsfoundation.lams.learning.web.util.LearningWebUtil;
 import org.lamsfoundation.lams.learningdesign.Activity;
@@ -42,7 +41,6 @@
 import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 /**
@@ -71,8 +69,8 @@
      * @throws ServletException
      */
     @RequestMapping("/CompleteActivity")
-    public String execute(@ModelAttribute("messageForm") ActivityForm messageForm, HttpServletRequest request,
-	    HttpServletResponse response) throws IOException, ServletException {
+    public String execute(HttpServletRequest request, HttpServletResponse response)
+	    throws IOException, ServletException {
 	Integer learnerId = LearningWebUtil.getUserId();
 
 	// This must get the learner progress from the progress id, not cached from the request,
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/DisplayOptionsActivityController.java
===================================================================
diff -u -r9f4048209accdf9125561d81be16ad32c833c812 -rc61226d9e999c36d82584f6fe2ed55e8a1545d23
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/DisplayOptionsActivityController.java	(.../DisplayOptionsActivityController.java)	(revision 9f4048209accdf9125561d81be16ad32c833c812)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/DisplayOptionsActivityController.java	(.../DisplayOptionsActivityController.java)	(revision c61226d9e999c36d82584f6fe2ed55e8a1545d23)
@@ -93,30 +93,31 @@
 	int completedActivitiesCount = 0;
 	while (i.hasNext()) {
 	    Activity optionsChildActivity = i.next();
-	    ActivityURL activityURL = activityMapping.getActivityURL(learnerProgress, optionsChildActivity, false, false);
+	    ActivityURL activityURL = activityMapping.getActivityURL(learnerProgress, optionsChildActivity, false,
+		    false);
 
 	    if (activityURL.isComplete()) {
 		completedActivitiesCount++;
 
 		//create list of activityURLs of all children activities
 		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();
+			optionsChildActivityInit = (SequenceActivity) ((HibernateProxy) optionsChildActivity)
+				.getHibernateLazyInitializer().getImplementation();
 		    } else {
 			optionsChildActivityInit = (SequenceActivity) optionsChildActivity;
 		    }
-		    
+
 		    List<ActivityURL> childActivities = new ArrayList<>();
 		    for (Activity sequenceChildActivity : optionsChildActivityInit.getActivities()) {
-			ActivityURL sequenceActivityURL = activityMapping.getActivityURL(
-				learnerProgress, sequenceChildActivity, false, false);
+			ActivityURL sequenceActivityURL = activityMapping.getActivityURL(learnerProgress,
+				sequenceChildActivity, false, false);
 			childActivities.add(sequenceActivityURL);
 		    }
 		    activityURL.setChildActivities(childActivities);
@@ -129,7 +130,7 @@
 	if (completedActivitiesCount >= optionsActivity.getMinNumberOfOptionsNotNull().intValue()) {
 	    form.setMinimumLimitReached(true);
 	}
-	
+
 	if (completedActivitiesCount > 0) {
 	    form.setHasCompletedActivities(true);
 	}
@@ -138,9 +139,11 @@
 	    form.setMaxActivitiesReached(true);
 	}
 
-	int minNumberOfOptions = optionsActivity.getMinNumberOfOptions() == null ? 0 : optionsActivity.getMinNumberOfOptions();
+	int minNumberOfOptions = optionsActivity.getMinNumberOfOptions() == null ? 0
+		: optionsActivity.getMinNumberOfOptions();
 	form.setMinimum(minNumberOfOptions);
-	int maxNumberOfOptions = optionsActivity.getMaxNumberOfOptions() == null ? 0 : optionsActivity.getMaxNumberOfOptions();
+	int maxNumberOfOptions = optionsActivity.getMaxNumberOfOptions() == null ? 0
+		: optionsActivity.getMaxNumberOfOptions();
 	form.setMaximum(maxNumberOfOptions);
 	form.setDescription(optionsActivity.getDescription());
 	form.setTitle(optionsActivity.getTitle());
@@ -155,6 +158,7 @@
 
 	// lessonId needed for the progress bar
 	request.setAttribute(AttributeNames.PARAM_LESSON_ID, learnerProgress.getLesson().getLessonId());
+	request.setAttribute("isPreview", learnerProgress.getLesson().isPreviewLesson());
 
 	return "optionsActivity";
     }
Index: lams_learning/web/branching/preview.jsp
===================================================================
diff -u -r54007f98ca71e0073f19c5db78536437123287c6 -rc61226d9e999c36d82584f6fe2ed55e8a1545d23
--- lams_learning/web/branching/preview.jsp	(.../preview.jsp)	(revision 54007f98ca71e0073f19c5db78536437123287c6)
+++ lams_learning/web/branching/preview.jsp	(.../preview.jsp)	(revision c61226d9e999c36d82584f6fe2ed55e8a1545d23)
@@ -58,11 +58,6 @@
 				alert("<fmt:message key="message.activity.options.noActivitySelected" />");
 				return false;
 			}
-			
-			function submitForm(methodName) {
-				var f = document.getElementById('messageForm');
-				f.submit();
-			}
 		</script>
 		
 		<c:set var="title"><c:out value="${branchingForm.title}" /></c:set>
@@ -134,13 +129,26 @@
 							</tr>
 						</c:forEach>
 					</table>
-		
-					<button class="btn btn-primary pull-right">
+			
+					<button class="btn btn-primary pull-left">
 						<fmt:message key="label.activity.options.choose" />
 					</button>
 		
 				</form:form>
+				
+									
+				<form action="/lams/learning/CompleteActivity.do" method="post">
+					<input type="hidden" name="activityID" value="${branchingForm.activityID}">
+					<input type="hidden" name="progressID" value="${branchingForm.progressID}">
+			
+					<button class="btn btn-primary pull-right na" onclick="finishActivity()">
+						<fmt:message key="label.finish.button" />
+					</button>
+			
+				</form>
 			</div>
+			
+
 		<!--closes content-->
 		
 		<div id="footer"></div>
Index: lams_learning/web/optionsActivity.jsp
===================================================================
diff -u -r5b29d2ec94e51933e89af2401bc85f83d42307af -rc61226d9e999c36d82584f6fe2ed55e8a1545d23
--- lams_learning/web/optionsActivity.jsp	(.../optionsActivity.jsp)	(revision 5b29d2ec94e51933e89af2401bc85f83d42307af)
+++ lams_learning/web/optionsActivity.jsp	(.../optionsActivity.jsp)	(revision c61226d9e999c36d82584f6fe2ed55e8a1545d23)
@@ -194,7 +194,7 @@
 			</form:form>
 		</div>
 		
-		<c:if test="${optionsActivityForm.minimumLimitReached}">
+		<c:if test="${optionsActivityForm.minimumLimitReached or isPreview}">
 			<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}' />">