Index: lams_tool_preview/.classpath
===================================================================
diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -r2ebad3a3c94cec1580e3b4d9c076773d78a5cc29
--- lams_tool_preview/.classpath	(.../.classpath)	(revision 62aaf160878735888d077bf28fac3c1989bb8fbd)
+++ lams_tool_preview/.classpath	(.../.classpath)	(revision 2ebad3a3c94cec1580e3b4d9c076773d78a5cc29)
@@ -2,7 +2,6 @@
 <classpath>
 	<classpathentry kind="src" path="src/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/3rdParty"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/com.genuitec.eclipse.j2eedt.core.J2EE14_CONTAINER"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/lams_common"/>
 	<classpathentry exported="true" kind="var" path="WILDFLY_HOME/modules/system/layers/base/javax/servlet/api/main/jboss-servlet-api_3.1_spec-1.0.0.Final.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/servlet-api">
@@ -24,5 +23,6 @@
 	<classpathentry exported="true" kind="var" path="WILDFLY_HOME/modules/system/layers/base/com/fasterxml/jackson/core/jackson-core/main/jackson-core-2.7.4.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/jackson"/>
 	<classpathentry exported="true" kind="var" path="WILDFLY_HOME/modules/system/layers/base/com/fasterxml/jackson/core/jackson-databind/main/jackson-databind-2.7.4.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/jackson"/>
 	<classpathentry exported="true" kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/jboss/log4j/logmanager/main/log4j-jboss-logmanager-1.1.2.Final.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/noStruts"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java
===================================================================
diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -r2ebad3a3c94cec1580e3b4d9c076773d78a5cc29
--- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java	(.../PeerreviewServiceImpl.java)	(revision 62aaf160878735888d077bf28fac3c1989bb8fbd)
+++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java	(.../PeerreviewServiceImpl.java)	(revision 2ebad3a3c94cec1580e3b4d9c076773d78a5cc29)
@@ -286,8 +286,6 @@
 		return false;
 	    }
 
-	    // long start = System.currentTimeMillis();
-
 	    PeerreviewSession session = getPeerreviewSessionBySessionId(toolSessionId);
 	    int numberPotentialLearners = toolService.getCountUsersForActivity(toolSessionId);
 	    int numberActualLearners = peerreviewUserDao.getCountUsersBySession(toolSessionId);
@@ -296,9 +294,9 @@
 		numUsersCreated = peerreviewUserDao.createUsersForSession(session);
 	    }
 
-	    // log.debug("Peer Review UserCreateThread " + toolSessionId + ": numUsersCreated "+numUsersCreated+" took:
-	    // "
-	    // + (System.currentTimeMillis() - start) + "ms.");
+	    if ( log.isDebugEnabled() ) {
+		log.debug("Peer Review UserCreateThread " + toolSessionId + ": numUsersCreated "+numUsersCreated);
+	    }
 
 	    creatingUsersForSessionIds.remove(toolSessionId);
 	    return true;
@@ -496,7 +494,6 @@
     }
 
     @Override
-    @SuppressWarnings("unchecked")
     public LinkedHashMap<String, ExcelCell[][]> exportTeamReportSpreadsheet(Long toolContentId) {
 
 	Peerreview peerreview = peerreviewDao.getByContentId(toolContentId);
@@ -532,28 +529,26 @@
     // *****************************************************************************
 
     private Peerreview getDefaultPeerreview() throws PeerreviewApplicationException {
-	Long defaultPeerreviewId = getToolDefaultContentIdBySignature(PeerreviewConstants.TOOL_SIGNATURE);
+	Long defaultPeerreviewId = new Long(
+		toolService.getToolDefaultContentIdBySignature(PeerreviewConstants.TOOL_SIGNATURE));
+	if (defaultPeerreviewId.equals(0L)) {
+	    String error = new StringBuilder("Could not retrieve default content id for this tool ")
+		    .append(PeerreviewConstants.TOOL_SIGNATURE).toString();
+	    log.error(error);
+	    throw new PeerreviewApplicationException(error);
+	}
 	Peerreview defaultPeerreview = getPeerreviewByContentId(defaultPeerreviewId);
 	if (defaultPeerreview == null) {
-	    String error = messageService.getMessage("error.msg.default.content.not.find");
+	    String error = new StringBuilder("Could not retrieve default content id for this tool ")
+		    .append(PeerreviewConstants.TOOL_SIGNATURE).append(" Looking for id ").append(defaultPeerreviewId)
+		    .toString();
 	    log.error(error);
 	    throw new PeerreviewApplicationException(error);
 	}
 
 	return defaultPeerreview;
     }
 
-    private Long getToolDefaultContentIdBySignature(String toolSignature) throws PeerreviewApplicationException {
-	Long contentId = null;
-	contentId = new Long(toolService.getToolDefaultContentIdBySignature(toolSignature));
-	if (contentId == null) {
-	    String error = messageService.getMessage("error.msg.default.content.not.find");
-	    log.error(error);
-	    throw new PeerreviewApplicationException(error);
-	}
-	return contentId;
-    }
-
     // *******************************************************************************
     // ToolContentManager, ToolSessionManager methods
     // *******************************************************************************
@@ -722,7 +717,6 @@
     }
 
     @Override
-    @SuppressWarnings("unchecked")
     public void removeLearnerContent(Long toolContentId, Integer userId) throws ToolException {
 	if (log.isDebugEnabled()) {
 	    log.debug("Removing Peerreview content for user ID " + userId + " and toolContentId " + toolContentId);
@@ -853,6 +847,7 @@
 	return null;
     }
 
+    @SuppressWarnings("rawtypes")
     @Override
     public ToolSessionExportOutputData exportToolSession(List toolSessionIds)
 	    throws DataMissingException, ToolException {
@@ -890,7 +885,8 @@
     }
 
     @Override
-    public Class[] getSupportedToolOutputDefinitionClasses(int definitionType) {
+    @SuppressWarnings("rawtypes")
+   public Class[] getSupportedToolOutputDefinitionClasses(int definitionType) {
 	return null;
     }
 
Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/controller/AuthoringController.java
===================================================================
diff -u -r1042117ad93a6a9f93d8b1c8be7e718b7efd383f -r2ebad3a3c94cec1580e3b4d9c076773d78a5cc29
--- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision 1042117ad93a6a9f93d8b1c8be7e718b7efd383f)
+++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision 2ebad3a3c94cec1580e3b4d9c076773d78a5cc29)
@@ -34,7 +34,6 @@
 
 import org.apache.commons.beanutils.PropertyUtils;
 import org.apache.log4j.Logger;
-import org.lamsfoundation.lams.authoring.web.AuthoringConstants;
 import org.lamsfoundation.lams.rating.model.RatingCriteria;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.peerreview.PeerreviewConstants;
@@ -43,6 +42,7 @@
 import org.lamsfoundation.lams.tool.peerreview.service.IPeerreviewService;
 import org.lamsfoundation.lams.tool.peerreview.web.form.PeerreviewForm;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.util.CommonConstants;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.lamsfoundation.lams.web.util.SessionMap;
@@ -98,7 +98,7 @@
      *
      * This method will avoid read database again and lost un-saved resouce item
      * lost when user "refresh page",
-     * 
+     *
      * @throws ServletException
      */
     private String doStart(PeerreviewForm peerreviewForm, HttpServletRequest request, HttpSession session)
@@ -144,7 +144,7 @@
 
     /**
      * Display same entire authoring page content from HttpSession variable.
-     * 
+     *
      * @throws ServletException
      */
     @RequestMapping("/init")
@@ -170,7 +170,7 @@
     /**
      * This method will persist all information in this authoring page, include
      * all peer review item, information etc.
-     * 
+     *
      * @throws NoSuchMethodException
      * @throws InvocationTargetException
      * @throws IllegalAccessException
@@ -232,7 +232,7 @@
 
 	peerreviewForm.setPeerreview(peerreviewPO);
 
-	request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
+	request.setAttribute(CommonConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
 	return AUTHORING_PATH;
     }
 
Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/controller/ClearSessionController.java
===================================================================
diff -u -r1042117ad93a6a9f93d8b1c8be7e718b7efd383f -r2ebad3a3c94cec1580e3b4d9c076773d78a5cc29
--- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/controller/ClearSessionController.java	(.../ClearSessionController.java)	(revision 1042117ad93a6a9f93d8b1c8be7e718b7efd383f)
+++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/controller/ClearSessionController.java	(.../ClearSessionController.java)	(revision 2ebad3a3c94cec1580e3b4d9c076773d78a5cc29)
@@ -29,16 +29,17 @@
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
-import org.lamsfoundation.lams.authoring.web.AuthoringConstants;
-import org.lamsfoundation.lams.authoring.web.LamsAuthoringFinishController;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
+import org.lamsfoundation.lams.util.CommonConstants;
+import org.lamsfoundation.lams.web.controller.LamsAuthoringFinishController;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.context.WebApplicationContext;
 
 /**
  * This class give a chance to clear HttpSession when user save/close authoring page.
+ *
  * @author Steve.Ni
  */
 @Controller
@@ -54,7 +55,7 @@
 
     @Override
     public void clearSession(String customiseSessionID, HttpSession session, ToolAccessMode mode) {
-	session.removeAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG);
+	session.removeAttribute(CommonConstants.LAMS_AUTHORING_SUCCESS_FLAG);
 	if (mode.isAuthor()) {
 	    session.removeAttribute(customiseSessionID);
 	}
Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/controller/LearningController.java
===================================================================
diff -u -r1042117ad93a6a9f93d8b1c8be7e718b7efd383f -r2ebad3a3c94cec1580e3b4d9c076773d78a5cc29
--- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/controller/LearningController.java	(.../LearningController.java)	(revision 1042117ad93a6a9f93d8b1c8be7e718b7efd383f)
+++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/controller/LearningController.java	(.../LearningController.java)	(revision 2ebad3a3c94cec1580e3b4d9c076773d78a5cc29)
@@ -36,8 +36,7 @@
 import javax.servlet.http.HttpSession;
 
 import org.apache.log4j.Logger;
-import org.lamsfoundation.lams.learning.web.bean.ActivityPositionDTO;
-import org.lamsfoundation.lams.learning.web.util.LearningWebUtil;
+import org.lamsfoundation.lams.learningdesign.dto.ActivityPositionDTO;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
 import org.lamsfoundation.lams.rating.dto.StyledCriteriaRatingDTO;
@@ -94,7 +93,7 @@
      * method run successfully.
      *
      * This method will avoid read database again and lost un-saved resouce item lost when user "refresh page",
-     * 
+     *
      * @throws IOException
      * @throws ServletException
      *
@@ -149,7 +148,7 @@
 	    request.setAttribute(PeerreviewConstants.ATTR_CREATING_USERS, "true");
 	    return DEFINE_LATER_PATH;
 
-	    //in case user is hidden by the monitor - show him learningHiddenUser.jsp page 
+	    //in case user is hidden by the monitor - show him learningHiddenUser.jsp page
 	} else if (user.isHidden()) {
 	    return HIDDEN_USER_PATH;
 
@@ -164,7 +163,7 @@
 
     /**
      * Same as start but doesn't create a new session map.
-     * 
+     *
      * @throws IOException
      * @throws ServletException
      *
@@ -221,7 +220,7 @@
      * method run successfully.
      *
      * This method will avoid read database again and lost un-saved resouce item lost when user "refresh page",
-     * 
+     *
      * @throws IOException
      * @throws ServletException
      *
@@ -261,8 +260,8 @@
 	peerreview.setDefineLater(false);
 	service.saveOrUpdatePeerreview(peerreview);
 
-	ActivityPositionDTO activityPosition = LearningWebUtil.putActivityPositionInRequestByToolSessionId(sessionId,
-		request, applicationContext.getServletContext());
+	ActivityPositionDTO activityPosition = WebUtil.putActivityPositionInRequestByToolSessionId(sessionId, request,
+		applicationContext.getServletContext());
 	sessionMap.put(AttributeNames.ATTR_ACTIVITY_POSITION, activityPosition);
 
 	//markUser as not Finished if it's redo
@@ -317,8 +316,9 @@
 
 		int stepNum = 1;
 		for (RatingCriteria toCheck : criterias) {
-		    if (newCriteria.getRatingCriteriaId() == toCheck.getRatingCriteriaId())
+		    if (newCriteria.getRatingCriteriaId() == toCheck.getRatingCriteriaId()) {
 			break;
+		    }
 		    stepNum++;
 		}
 		request.setAttribute("stepNumber", stepNum);
@@ -395,21 +395,25 @@
 		    ? PeerreviewConstants.SORT_BY_AVERAGE_RESULT_DESC
 		    : PeerreviewConstants.SORT_BY_AVERAGE_RESULT_ASC;
 
-	    if (allUsersDtos != null)
+	    if (allUsersDtos != null) {
 		allUsersDtos.add(service.getUsersRatingsCommentsByCriteriaIdDTO(peerreview.getContentId(), sessionId,
 			criteria, user.getUserId(), false, sorting, null, showAllUsers, true));
+	    }
 
-	    if (currentUserDtos != null)
+	    if (currentUserDtos != null) {
 		currentUserDtos.add(service.getUsersRatingsCommentsByCriteriaIdDTO(peerreview.getContentId(), sessionId,
 			criteria, user.getUserId(), false, sorting, null, showAllUsers, false));
+	    }
 
 	}
 
-	if (allUsersDtos != null)
+	if (allUsersDtos != null) {
 	    request.setAttribute("allCriteriaRatings", allUsersDtos);
+	}
 
-	if (currentUserDtos != null)
+	if (currentUserDtos != null) {
 	    request.setAttribute("userRatings", currentUserDtos);
+	}
 
 	int[] numPossibleRatings = service.getNumberPossibleRatings(peerreview.getContentId(), sessionId,
 		user.getUserId());
@@ -521,7 +525,7 @@
 		PeerreviewConstants.SORT_BY_USERNAME_ASC, null, peerreview.isSelfReview(), true);
 
 	// Send the number of users to rate in rateAll, or send 0. Do not want to modify the criteria min/max as it is originally
-	// a Hibernate object and don't want to risk updating it in the db. Need to send a flag so why not make flag double as the 
+	// a Hibernate object and don't want to risk updating it in the db. Need to send a flag so why not make flag double as the
 	// runtime min/max value while leaving min/max as the original criteria definition.
 	int rateAllUsers = 0;
 	if ((criteria.isRankingStyleRating() && criteria.getMaxRating() == RatingCriteria.RATING_RANK_ALL)
@@ -532,7 +536,7 @@
 		&& (peerreview.getMinimumRates() > 0 || peerreview.getMaximumRates() > 0)
 		&& (dto.getRatingCriteria().getMinimumRates() == 0 && dto.getRatingCriteria().getMaximumRates() == 0)) {
 	    // override the min/max for stars based on old settings if needed (original Peer Review kept one setting for all criteria )
-	    // does not matter if this change gets persisted to database. 
+	    // does not matter if this change gets persisted to database.
 	    criteria.setMinimumRates(peerreview.getMinimumRates());
 	    criteria.setMaximumRates(peerreview.getMaximumRates());
 	}
@@ -645,8 +649,9 @@
 		    if (comment != null) {
 			countCommentsSaved++;
 			// save the comment to the database.
-			if (comment.length() > 0)
+			if (comment.length() > 0) {
 			    service.commentItem(criteria, toolSessionId, userId, itemId, comment);
+			}
 		    }
 		}
 	    }
@@ -750,8 +755,9 @@
 
 	    if (criteria.isHedgeStyleRating() && criteria.isCommentsEnabled()) {
 		String justify = request.getParameter("justify");
-		if (justify != null && justify.length() > 0)
+		if (justify != null && justify.length() > 0) {
 		    service.commentItem(criteria, toolSessionId, userId, criteria.getRatingCriteriaId(), justify);
+		}
 	    }
 
 	}
@@ -853,7 +859,7 @@
     @SuppressWarnings("unchecked")
     public String submitReflection(@ModelAttribute ReflectionForm form, HttpServletRequest request,
 	    HttpServletResponse response, HttpSession session) {
-	ReflectionForm refForm = (ReflectionForm) form;
+	ReflectionForm refForm = form;
 	Integer userId = refForm.getUserID();
 
 	String sessionMapID = WebUtil.readStrParam(request, PeerreviewConstants.ATTR_SESSION_MAP_ID);
Index: lams_tool_preview/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -r2ebad3a3c94cec1580e3b4d9c076773d78a5cc29
--- lams_tool_preview/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 62aaf160878735888d077bf28fac3c1989bb8fbd)
+++ lams_tool_preview/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 2ebad3a3c94cec1580e3b4d9c076773d78a5cc29)
@@ -212,191 +212,6 @@
 
    </tag>
 
-  	<tag>
-		<name>STRUTS-textarea</name>
-		<tag-class>org.lamsfoundation.lams.web.tag.MultiLinesTextareaTag</tag-class>
-		<body-content>empty</body-content>
-		<attribute>
-			<name>accesskey</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>alt</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>altKey</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>bundle</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>cols</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>disabled</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>errorKey</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>errorStyle</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>errorStyleClass</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>errorStyleId</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>index</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>indexed</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>name</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>onblur</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>onchange</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>onclick</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>ondblclick</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>onfocus</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>onkeydown</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>onkeypress</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>onkeyup</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>onmousedown</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>onmousemove</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>onmouseout</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>onmouseover</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>onmouseup</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>property</name>
-			<required>true</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>readonly</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>rows</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>style</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>styleClass</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>styleId</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>tabindex</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>title</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>titleKey</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>value</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-	</tag>
 	
 	<tag>
       <description>Small portrait of a user</description>
Index: lams_tool_preview/web/pages/authoring/advance.jsp
===================================================================
diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -r2ebad3a3c94cec1580e3b4d9c076773d78a5cc29
--- lams_tool_preview/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision 62aaf160878735888d077bf28fac3c1989bb8fbd)
+++ lams_tool_preview/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision 2ebad3a3c94cec1580e3b4d9c076773d78a5cc29)
@@ -1,49 +1,48 @@
 <%@ include file="/common/taglibs.jsp"%>
-<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 
 <!-- Advance Tab Content -->
 
 <lams:SimplePanel titleKey="label.review.options">
 
 	<div class="form-group">
 	<label for="maximumRatesPerUser"><fmt:message key="label.max.number.marks.each.user" /></label>
-		<html:select property="peerreview.maximumRatesPerUser" styleClass="form-control form-control-inline">
-			<html:option value="0">
+		<form:select path="peerreview.maximumRatesPerUser" cssClass="form-control form-control-inline">
+			<form:option value="0">
 				<fmt:message key="label.no.maximum" />
-			</html:option>
-			<html:option value="1">1</html:option>
-			<html:option value="2">2</html:option>
-			<html:option value="3">3</html:option>
-			<html:option value="4">4</html:option>
-			<html:option value="5">5</html:option>
-			<html:option value="6">6</html:option>
-			<html:option value="7">7</html:option>
-			<html:option value="8">8</html:option>
-			<html:option value="9">9</html:option>
-			<html:option value="10">10</html:option>
-		</html:select>
+			</form:option>
+			<form:option value="1">1</form:option>
+			<form:option value="2">2</form:option>
+			<form:option value="3">3</form:option>
+			<form:option value="4">4</form:option>
+			<form:option value="5">5</form:option>
+			<form:option value="6">6</form:option>
+			<form:option value="7">7</form:option>
+			<form:option value="8">8</form:option>
+			<form:option value="9">9</form:option>
+			<form:option value="10">10</form:option>
+		</form:select>
 	</div>
 	
 	<div class="checkbox">
-	<label for="show-ratings-left-by-user"><html:checkbox property="peerreview.showRatingsLeftByUser" styleId="show-ratings-left-by-user"/>
+	<label for="show-ratings-left-by-user"><form:checkbox path="peerreview.showRatingsLeftByUser" id="show-ratings-left-by-user"/>
 	<fmt:message key="label.show.ratings.left.by.user" />
 	</label>
 	</div>
 
 	<div class="checkbox">
-	<label for="show-ratings-left-for-user"><html:checkbox property="peerreview.showRatingsLeftForUser" styleId="show-ratings-left-for-user"/>
+	<label for="show-ratings-left-for-user"><form:checkbox path="peerreview.showRatingsLeftForUser" id="show-ratings-left-for-user"/>
 	<fmt:message key="label.show.ratings.left.for.user" />
 	</label>
 	</div>
 
 	<div class="checkbox">
-	<label for="self-review"><html:checkbox property="peerreview.selfReview" styleId="self-review"/>
+	<label for="self-review"><form:checkbox path="peerreview.selfReview" id="self-review"/>
 	<fmt:message key="label.self.review" />
 	</label>
 	</div>
 
 	<div class="checkbox">
-	<label for="notify-users-of-results"><html:checkbox property="peerreview.notifyUsersOfResults" styleId="notify-users-of-results"/>
+	<label for="notify-users-of-results"><form:checkbox path="peerreview.notifyUsersOfResults" id="notify-users-of-results"/>
 	<fmt:message key="label.notify.user.of.results" />
 	</label>
 	</div>
@@ -55,16 +54,16 @@
 
 <lams:SimplePanel titleKey="label.activity.completion">
 	<div class="checkbox">
-	<label for="lockWhenFinished"><html:checkbox property="peerreview.lockWhenFinished" styleId="lockWhenFinished" />
+	<label for="lockWhenFinished"><form:checkbox path="peerreview.lockWhenFinished" id="lockWhenFinished" />
 	<fmt:message key="label.authoring.advance.lock.on.finished" /></label>
 	</div>
 	
 	<div class="checkbox">
-	<label for="reflectOn"><html:checkbox property="peerreview.reflectOnActivity" styleId="reflectOn"/>
+	<label for="reflectOn"><form:checkbox path="peerreview.reflectOnActivity" id="reflectOn"/>
 	<fmt:message key="label.authoring.advanced.reflectOnActivity" /></label>
 	</div>
 	<div class="form-group">
-	<html:textarea property="peerreview.reflectInstructions" styleId="reflectInstructions"  styleClass="form-control" rows="3"/>
+	<form:textarea path="peerreview.reflectInstructions" id="reflectInstructions"  cssClass="form-control" rows="3"/>
 	</div>
 </lams:SimplePanel>