Index: lams_learning/web/optionsActivity.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1f7150d6142f994d113ba543736a9f7c0e154337
--- lams_learning/web/optionsActivity.jsp	(.../optionsActivity.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_learning/web/optionsActivity.jsp	(.../optionsActivity.jsp)	(revision 1f7150d6142f994d113ba543736a9f7c0e154337)
@@ -45,7 +45,7 @@
 
 	<div class="group-box">
 
-		<html:form action="/ChooseActivity" method="post" onsubmit="return validate();">
+		<form:form action="ChooseActivity.do mo`" modelAttribute="activityForm" method="post" onsubmit="return validate();">
 			<input type="hidden" name="lams_token" value="<c:out value='${lams_token}' />">
 
 			<div class="options">
@@ -113,14 +113,14 @@
 
 					</c:when>
 					<c:otherwise>
-						<html:submit styleClass="btn btn-default">
+						<button class="btn btn-default">
 							<fmt:message key="label.activity.options.choose" />
-						</html:submit>
+						</button>
 					</c:otherwise>
 				</c:choose>
 			</div>
 
-		</html:form>
+		</form:form>
 	</div>
 
 
@@ -135,7 +135,7 @@
 		//-->
 		</script>
 
-		<html:form action="/CompleteActivity" method="post" styleId="messageForm">
+		<form:form action="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}' />">
@@ -174,7 +174,7 @@
 			<hr class="msg-hr">
 
 			<div class="voffset10">
-				<html:link href="javascript:;" styleClass="btn btn-primary pull-right na" styleId="finishButton"
+				<a href="javascript:;" class="btn btn-primary pull-right na" id="finishButton"
 					onclick="submitForm('finish')">
 					<c:choose>
 						<c:when test="${activityPosition.last}">
@@ -184,9 +184,9 @@
 							<fmt:message key="label.finish.button" />
 						</c:otherwise>
 					</c:choose>
-				</html:link>
+				</a>
 			</div>
 
-		</html:form>
+		</form:form>
 	</c:if>
 </lams:Page>
\ No newline at end of file