Index: lams_tool_nb/web/message.jsp
===================================================================
diff -u -r8aded0b18a5a7712622ae56f38923fa297449977 -ra2d72bee6029b7e05e8cd696c02db214f3049365
--- lams_tool_nb/web/message.jsp	(.../message.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
+++ lams_tool_nb/web/message.jsp	(.../message.jsp)	(revision a2d72bee6029b7e05e8cd696c02db214f3049365)
@@ -21,27 +21,28 @@
 		<fmt:message key="activity.title" />
 	</h1>
 	
-	<logic:messagesPresent message="true">
-		<html:messages id="message" message="true">
-			<p>
-				<bean:write name="message" />
-			</p>
-		</html:messages>
-	</logic:messagesPresent>
+	<c:set var="hasErrors">
+		<form:errors path='*'/>
+	</c:set>
+	<c:if test="${not empty hasErrors}">
+		<lams:Alert id="error" type="danger" close="false">
+		<form:errors path="*"/>
+		</lams:Alert>
+	</c:if>
 	
 	<div class="align-right space-bottom-top">
-		<html:form action="/learner" target="_self" onsubmit="disableFinishButton();" styleId="messageForm">
-			<html:hidden property="toolSessionID" />
-			<html:hidden property="mode" />
-			<html:hidden property="method" value="finish"/>
+		<form:form modelAttribute="messageForm" action="/learner" target="_self" onsubmit="disableFinishButton();" id="messageForm">
+			<form:hidden path="toolSessionID" />
+			<form:hidden path="mode" />
+			<form:hidden path="method" value="finish"/>
 			<c:choose>
 				<c:when test="${reflectOnActivity}">
-					<html:submit property="method" styleClass="button">
+					<input type="submit" name="method" class="button">
 						<fmt:message key="button.continue" />
-					</html:submit>
+					</input>
 				</c:when>
 				<c:otherwise>
-					<html:link href="#nogo" styleClass="button" styleId="finishButton" onclick="submitForm('finish')">
+					<a href="#nogo" class="button" id="finishButton" onclick="submitForm('finish')">
 						<span class="nextActivity">
 							<c:choose>
 								<c:when test="${activityPosition.last}">
@@ -52,10 +53,10 @@
 								</c:otherwise>
 							</c:choose>
 						</span>
-					</html:link>
+					</a>
 				</c:otherwise>
 			</c:choose>
-		</html:form>
+		</form:form>
 	</div>
 
 </div>