Index: lams_tool_lamc/web/authoring/AdvancedContent.jsp
===================================================================
diff -u -r2dca74ca01cdce55ea691b9784f19ac9f528f104 -r424f8d213bbff9badfb9b913fd7c68d5cc1d5c3d
--- lams_tool_lamc/web/authoring/AdvancedContent.jsp	(.../AdvancedContent.jsp)	(revision 2dca74ca01cdce55ea691b9784f19ac9f528f104)
+++ lams_tool_lamc/web/authoring/AdvancedContent.jsp	(.../AdvancedContent.jsp)	(revision 424f8d213bbff9badfb9b913fd7c68d5cc1d5c3d)
@@ -1,10 +1,9 @@
 <%@ include file="/common/taglibs.jsp"%>
-<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
 
 <lams:SimplePanel titleKey="label.select.leader">
 	<div class="checkbox">
 		<label for="useSelectLeaderToolOuput">
-			<html:checkbox property="useSelectLeaderToolOuput" value="1" styleId="useSelectLeaderToolOuput" onclick="clickSelectLeaderToolOuputHandler();"/>
+			<form:checkbox path="useSelectLeaderToolOuput" value="1" id="useSelectLeaderToolOuput" onclick="clickSelectLeaderToolOuputHandler();"/>
 			<fmt:message key="label.use.select.leader.tool.output" />
 		</label>
 	</div>
@@ -13,46 +12,46 @@
 <lams:SimplePanel titleKey="label.question.options">
 	<div class="checkbox">
 		<label for="prefixAnswersWithLetters">
-			<html:checkbox property="prefixAnswersWithLetters" value="1" styleId="prefixAnswersWithLetters"/>
+			<form:checkbox path="prefixAnswersWithLetters" value="1" id="prefixAnswersWithLetters"/>
 			<fmt:message key="label.prefix.sequential.letters.for.each.answer" />
 		</label>
 	</div>
 	
 	<div class="checkbox">
 		<label for="questionsSequenced">
-			<html:checkbox property="questionsSequenced" value="1" styleId="questionsSequenced"/>
+			<form:checkbox path="questionsSequenced" value="1" id="questionsSequenced"/>
 			<fmt:message key="radiobox.onepq" />
 		</label>
 	</div>
 	
 	<div class="checkbox">
 		<label for="showMarks">
-			<html:checkbox property="showMarks" value="1" styleId="showMarks"/>
+			<form:checkbox path="showMarks" value="1" id="showMarks"/>
 			<fmt:message key="label.showMarks" />
 		</label>
 	</div>
 	
 	<div class="checkbox">
 		<label for="randomize">
-			<html:checkbox property="randomize" value="1" styleId="randomize"/>
+			<form:checkbox path="randomize" value="1" id="randomize"/>
 			<fmt:message key="label.randomize" />
 		</label>
 	</div>
 	
 	<div class="checkbox">
 		<label for="retries">
-			<html:checkbox property="retries" value="1" styleId="retries"/>
+			<form:checkbox path="retries" value="1" id="retries"/>
 			<fmt:message key="radiobox.retries" />
 		</label>
 	</div>
 	
 	<div class="form-inline loffset20">
 		<div id="passmark-container" class="form-group"
-				<c:if test="${formBean.retries != 1}">style="display:none;"</c:if>>
+				<c:if test="${mcAuthoringForm.retries != 1}">style="display:none;"</c:if>>
 			<select id="passmark" name="passmark"  class="form-control input-sm">
-				<c:if test="${formBean.passmark != 0}">
-					<option value="${formBean.passmark}" SELECTED>
-						${formBean.passmark}
+				<c:if test="${mcAuthoringForm.passmark != 0}">
+					<option value="${mcAuthoringForm.passmark}" SELECTED>
+						${mcAuthoringForm.passmark}
 					</option>
 				</c:if>
 			</select>
@@ -62,29 +61,29 @@
 
 	<div class="checkbox">
 		<label for="enable-confidence-levels">
-			<html:checkbox property="enableConfidenceLevels" value="true" styleId="enable-confidence-levels"/>
+			<form:checkbox path="enableConfidenceLevels" value="true" id="enable-confidence-levels"/>
 			<fmt:message key="label.enable.confidence.levels" />
 		</label>
 	</div>
 
 	<lams:SimplePanel panelBodyClass="panel-body-sm" titleKey="label.feedback.simple">
 	<div class="radio">
 		<label for="displayAnswers">
-			<html:radio property="displayAnswersFeedback" value="answers" styleId="displayAnswers"/>
+			<form:radiobutton path="displayAnswersFeedback" value="answers" id="displayAnswers"/>
 			<fmt:message key="label.displayAnswers" />		
 		</label>
 	</div>
 
 	<div class="radio form-inline">
 		<label for="displayFeedback">
-			<html:radio property="displayAnswersFeedback" value="feedback" styleId="displayFeedback"/>
+			<form:radiobutton path="displayAnswersFeedback" value="feedback" id="displayFeedback"/>
 			<fmt:message key="label.displayFeedbackOnly" />
 		</label>
 	</div>
 
 	<div class="radio form-inline">
 		<label for="displayNoAnswersOrFeedback">
-			<html:radio property="displayAnswersFeedback" value="none" styleId="displayNoAnswersOrFeedback"/>
+			<form:radiobutton path="displayAnswersFeedback" value="none" id="displayNoAnswersOrFeedback"/>
 			<fmt:message key="label.displayNoAnswersOrFeedback" />
 		</label>
 	</div>
@@ -95,12 +94,12 @@
 <lams:SimplePanel titleKey="label.activity.completion">
 	<div class="checkbox">
 		<label for="reflect">
-			<html:checkbox property="reflect" value="1" styleClass="noBorder" styleId="reflect"/>
+			<form:checkbox path="reflect" value="1" cssClass="noBorder" id="reflect"/>
 			<fmt:message key="label.reflect" />
 		</label>
 	</div>
 	<div class="form-group">
-		<html:textarea property="reflectionSubject" styleId="reflectInstructions"  styleClass="form-control" rows="3"/>
+		<textarea name="reflectionSubject" id="reflectInstructions" class="form-control" rows="3"></textarea>
 	</div>
 </lams:SimplePanel>