Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/BranchingActivityAction.java
===================================================================
diff -u -re27d5ecdab649eab65bec7460d22928bb972a722 -r17d3608930aacfebc6ed0068cbee5d481e7bedbf
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/BranchingActivityAction.java	(.../BranchingActivityAction.java)	(revision e27d5ecdab649eab65bec7460d22928bb972a722)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/BranchingActivityAction.java	(.../BranchingActivityAction.java)	(revision 17d3608930aacfebc6ed0068cbee5d481e7bedbf)
@@ -133,7 +133,6 @@
 		    activityURLs.add(activityURL);
 		}
 		branchForm.set("activityURLs", activityURLs);
-		branchForm.set("showNextButton", branchingActivity.getActivities().size() != completedCount);
 
 	    } else if (branch == null) {
 
Index: lams_learning/web/branching/preview.jsp
===================================================================
diff -u -r30578f3b1aea1249417edd0c01a73890da93a68e -r17d3608930aacfebc6ed0068cbee5d481e7bedbf
--- lams_learning/web/branching/preview.jsp	(.../preview.jsp)	(revision 30578f3b1aea1249417edd0c01a73890da93a68e)
+++ lams_learning/web/branching/preview.jsp	(.../preview.jsp)	(revision 17d3608930aacfebc6ed0068cbee5d481e7bedbf)
@@ -21,12 +21,11 @@
 
 <%@ include file="/common/taglibs.jsp"%>
 
-<script language="JavaScript" type="text/javascript"><!--
+<script type="text/javascript">
 	function validate() {
-		var validated = false;
-		
-		var form = document.forms[0];
-		var elements = form.elements;
+		var validated = false,
+			form = document.forms[0],
+			elements = form.elements;
 		for (var i = 0; i < elements.length; i++) {
 			if (elements[i].name == "branchID") {
 				if (elements[i].checked) {
@@ -35,20 +34,19 @@
 				}
 			}
 		}
-		if (!validated) {
-			alert("<fmt:message key="message.activity.options.noActivitySelected" />");
-			return false;
-		}
-		else {
+		
+		if (validated) {
 			return true;
 		}
+	
+		alert("<fmt:message key="message.activity.options.noActivitySelected" />");
+		return false;
 	}
-        function submitForm(methodName){
-                var f = document.getElementById('messageForm');
-                f.submit();
-        }
-
-	//-->
+	
+	function submitForm(methodName) {
+		var f = document.getElementById('messageForm');
+		f.submit();
+	}
 </script>
 
 <c:set var="title"><c:out value="${BranchingForm.map.title}" /></c:set>
@@ -121,31 +119,12 @@
 				</c:forEach>
 			</table>
 
-			<c:if test="${BranchingForm.map.showNextButton}">
-				<html:submit styleClass="btn btn-default pull-left">
-					<fmt:message key="label.activity.options.choose" />
-				</html:submit>
-			</c:if>
+			<html:submit styleClass="btn btn-primary pull-right">
+				<fmt:message key="label.activity.options.choose" />
+			</html:submit>
 
 		</html:form>
 	</div>
-
-	<c:if test="${BranchingForm.map.showFinishButton}">
-		<html:form action="/CompleteActivity" method="post" styleId="messageForm">
-			<input type="hidden" name="activityID"
-				value="<c:out value='${BranchingForm.map.activityID}' />">
-			<input type="hidden" name="lessonID"
-				value="<c:out value='${BranchingForm.map.lessonID}' />">
-			<input type="hidden" name="progressID"
-				value="<c:out value='${BranchingForm.map.progressID}' />">
-
-	        <html:link href="javascript:;" styleClass="btn btn-default pull-right" styleId="finishButton" onclick="submitForm('finish')">
-				<span class="nextActivity"><fmt:message key="label.finish.button" /></span>
-			</html:link>
-
-		</html:form>
-	</c:if>
-
 <!--closes content-->
 
 <div id="footer"></div>