Index: lams_tool_images/.externalToolBuilders/SASS_lams_tool_images.launch
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r9e395fca5d7eb4a5ac4c9768642a336723a950f7
--- lams_tool_images/.externalToolBuilders/SASS_lams_tool_images.launch	(.../SASS_lams_tool_images.launch)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_images/.externalToolBuilders/SASS_lams_tool_images.launch	(.../SASS_lams_tool_images.launch)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
@@ -1,16 +1,22 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
-<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_AUTO_TARGETS" value="sass.compile.auto,"/>
-<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_CLEAN_TARGETS" value="_sass.build.clean,"/>
-<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${project}"/>
-<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="lams_tool_images"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/lams_tool_images/web/includes/css&quot; type=&quot;2&quot;/&gt;&#10;&lt;/resources&gt;}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${build_project:/build.xml}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,clean"/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
+    <stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_AUTO_TARGETS" value="sass.compile.auto,"/>
+    <stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_CLEAN_TARGETS" value="_sass.build.clean,"/>
+    <booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
+    <booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
+    <stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${project}"/>
+    <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+        <listEntry value="/lams_tool_images"/>
+    </listAttribute>
+    <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+        <listEntry value="4"/>
+    </listAttribute>
+    <booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
+    <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
+    <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
+    <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="lams_tool_images"/>
+    <stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/lams_tool_images/web/includes/css&quot; type=&quot;2&quot;/&gt;&#10;&lt;/resources&gt;}"/>
+    <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${build_project:/build.xml}"/>
+    <stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,clean"/>
+    <booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
 </launchConfiguration>
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/ImageGalleryConstants.java
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r9e395fca5d7eb4a5ac4c9768642a336723a950f7
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/ImageGalleryConstants.java	(.../ImageGalleryConstants.java)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/ImageGalleryConstants.java	(.../ImageGalleryConstants.java)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
@@ -23,7 +23,7 @@
 
 package org.lamsfoundation.lams.tool.imageGallery;
 
-public class ImageGalleryConstants {
+public interface ImageGalleryConstants {
     public static final String TOOL_SIGNATURE = "laimag10";
     public static final String IMAGE_GALLERY_SERVICE = "laimagImageGalleryService";
     public static final String TOOL_CONTENT_HANDLER_NAME = "laimagImageGalleryToolContentHandler";
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/IImageGalleryService.java
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r9e395fca5d7eb4a5ac4c9768642a336723a950f7
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/IImageGalleryService.java	(.../IImageGalleryService.java)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/IImageGalleryService.java	(.../IImageGalleryService.java)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
@@ -27,7 +27,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.struts.upload.FormFile;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.rating.ToolRatingManager;
 import org.lamsfoundation.lams.rating.dto.ItemRatingDTO;
@@ -40,6 +39,7 @@
 import org.lamsfoundation.lams.tool.imageGallery.model.ImageGallerySession;
 import org.lamsfoundation.lams.tool.imageGallery.model.ImageGalleryUser;
 import org.lamsfoundation.lams.tool.imageGallery.model.ImageVote;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
  * Interface that defines the contract that all ShareImageGallery service provider must follow.
@@ -73,7 +73,7 @@
      * @param file
      * @throws UploadImageGalleryFileException
      */
-    void uploadImageGalleryItemFile(ImageGalleryItem item, FormFile file) throws UploadImageGalleryFileException;
+    void uploadImageGalleryItemFile(ImageGalleryItem item, MultipartFile file) throws UploadImageGalleryFileException;
 
     // ********** for user methods *************
     /**
@@ -285,8 +285,8 @@
      * Returns localized next image title.
      *
      * @param nextImageTitleNumber
-     * 
-     * @return 
+     *
+     * @return
      */
     String generateNextImageTitle(Long nextImageTitleNumber);
 
@@ -314,10 +314,10 @@
      * @return
      */
     boolean isGroupedActivity(long toolContentID);
-    
+
     /**
      * Audit log the teacher has started editing activity in monitor.
-     * 
+     *
      * @param toolContentID
      */
     void auditLogStartEditingActivityInMonitor(long toolContentID);
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r9e395fca5d7eb4a5ac4c9768642a336723a950f7
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java	(.../ImageGalleryServiceImpl.java)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java	(.../ImageGalleryServiceImpl.java)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
@@ -45,7 +45,6 @@
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
-import org.apache.struts.upload.FormFile;
 import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO;
 import org.lamsfoundation.lams.contentrepository.NodeKey;
 import org.lamsfoundation.lams.contentrepository.exception.InvalidParameterException;
@@ -99,6 +98,7 @@
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
 import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.util.imgscalr.ResizePictureUtil;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
  * @author Andrey Balan
@@ -310,7 +310,7 @@
 	    boolean isHidden = image.isHide();
 	    image.setHide(!isHidden);
 	    imageGalleryItemDao.saveObject(image);
-	    
+
 	    // audit log
 	    Long userId = image.getCreateBy() == null ? 0L : image.getCreateBy().getUserId();
 	    String loginName = image.getCreateBy() == null ? "No user" : image.getCreateBy().getLoginName();
@@ -347,7 +347,7 @@
     @Override
     public ItemRatingDTO getRatingCriteriaDtos(Long contentId, Long toolSessionId, Long imageUid, Long userId) {
 
-	LinkedList<Long> itemIds = new LinkedList<Long>();
+	LinkedList<Long> itemIds = new LinkedList<>();
 	itemIds.add(imageUid);
 	ItemRatingDTO ratingCriteria = getRatingCriteriaDtos(contentId, toolSessionId, itemIds, true, userId).get(0);
 
@@ -357,7 +357,8 @@
     @Override
     public List<ItemRatingDTO> getRatingCriteriaDtos(Long contentId, Long toolSessionId, Collection<Long> itemIds,
 	    boolean isCommentsByOtherUsersRequired, Long userId) {
-	return ratingService.getRatingCriteriaDtos(contentId, toolSessionId, itemIds, isCommentsByOtherUsersRequired, userId);
+	return ratingService.getRatingCriteriaDtos(contentId, toolSessionId, itemIds, isCommentsByOtherUsersRequired,
+		userId);
     }
 
     @Override
@@ -389,31 +390,31 @@
 
     @Override
     public List<List<Summary>> getSummary(Long contentId) {
-	List<List<Summary>> groupList = new ArrayList<List<Summary>>();
-	List<Summary> group = new ArrayList<Summary>();
+	List<List<Summary>> groupList = new ArrayList<>();
+	List<Summary> group = new ArrayList<>();
 
 	// get all item which is accessed by user
 	ImageGallery imageGallery = imageGalleryDao.getByContentId(contentId);
 
 	List<ImageGallerySession> sessionList = imageGallerySessionDao.getByContentId(contentId);
 	for (ImageGallerySession session : sessionList) {
 	    // one new group for one session.
-	    group = new ArrayList<Summary>();
+	    group = new ArrayList<>();
 	    Set<ImageGalleryItem> groupImages = getImagesForGroup(imageGallery, session.getSessionId());
 
 	    List<ItemRatingDTO> itemRatingDtos = null;
 	    if (imageGallery.isAllowRank()) {
 		// create itemIds list
-		List<Long> itemIds = new LinkedList<Long>();
+		List<Long> itemIds = new LinkedList<>();
 		for (ImageGalleryItem image : groupImages) {
 		    itemIds.add(image.getUid());
 		}
 		final Long USER_ID = -1L;
 		final boolean IS_COMMENTS_BY_OTHER_USERS_REQUIRED = true;
 		// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!TODO calculate average ratings based on one
 		// session data
-		itemRatingDtos = getRatingCriteriaDtos(contentId, session.getSessionId(), itemIds, IS_COMMENTS_BY_OTHER_USERS_REQUIRED,
-			USER_ID);
+		itemRatingDtos = getRatingCriteriaDtos(contentId, session.getSessionId(), itemIds,
+			IS_COMMENTS_BY_OTHER_USERS_REQUIRED, USER_ID);
 	    }
 
 	    for (ImageGalleryItem image : groupImages) {
@@ -450,22 +451,22 @@
 
     @Override
     public List<List<UserImageContributionDTO>> getImageSummary(Long contentId, Long imageUid) {
-	List<List<UserImageContributionDTO>> imageSummary = new ArrayList<List<UserImageContributionDTO>>();
-	List<UserImageContributionDTO> group = new ArrayList<UserImageContributionDTO>();
+	List<List<UserImageContributionDTO>> imageSummary = new ArrayList<>();
+	List<UserImageContributionDTO> group = new ArrayList<>();
 	ImageGalleryItem image = imageGalleryItemDao.getByUid(imageUid);
 	ImageGallery imageGallery = getImageGalleryByContentId(contentId);
 
 	List<ImageGallerySession> sessionList;
 	if (image.isCreateByAuthor()) {
 	    sessionList = imageGallerySessionDao.getByContentId(contentId);
 	} else {
-	    sessionList = new ArrayList<ImageGallerySession>();
+	    sessionList = new ArrayList<>();
 	    sessionList.add(image.getCreateBy().getSession());
 	}
 
 	for (ImageGallerySession session : sessionList) {
 	    // one new group for one session.
-	    group = new ArrayList<UserImageContributionDTO>();
+	    group = new ArrayList<>();
 	    //	    Object[] ratingForGroup = getRatingForGroup(image.getUid(), session.getSessionId());
 
 	    List<ImageGalleryUser> users = imageGalleryUserDao.getBySessionID(session.getSessionId());
@@ -511,13 +512,13 @@
 
     @Override
     public Map<Long, Set<ReflectDTO>> getReflectList(Long contentId, boolean setEntry) {
-	Map<Long, Set<ReflectDTO>> map = new HashMap<Long, Set<ReflectDTO>>();
+	Map<Long, Set<ReflectDTO>> map = new HashMap<>();
 
 	List<ImageGallerySession> sessionList = imageGallerySessionDao.getByContentId(contentId);
 	for (ImageGallerySession session : sessionList) {
 	    Long sessionId = session.getSessionId();
 	    boolean hasRefection = session.getImageGallery().isReflectOnActivity();
-	    Set<ReflectDTO> list = new TreeSet<ReflectDTO>(new ReflectDTOComparator());
+	    Set<ReflectDTO> list = new TreeSet<>(new ReflectDTOComparator());
 	    // get all users in this session
 	    List<ImageGalleryUser> users = imageGalleryUserDao.getBySessionID(sessionId);
 	    for (ImageGalleryUser user : users) {
@@ -541,7 +542,7 @@
     }
 
     @Override
-    public void uploadImageGalleryItemFile(ImageGalleryItem image, FormFile file)
+    public void uploadImageGalleryItemFile(ImageGalleryItem image, MultipartFile file)
 	    throws UploadImageGalleryFileException {
 
 	ImageGalleryConfigItem mediumImageDimensionsKey = getConfigItem(
@@ -551,15 +552,14 @@
 	ImageGalleryConfigItem thumbnailImageDimensionsKey = getConfigItem(
 		ImageGalleryConfigItem.KEY_THUMBNAIL_IMAGE_DIMENSIONS);
 	int thumbnailImageDimensions = Integer.parseInt(thumbnailImageDimensionsKey.getConfigValue());
-	    
+
 	try {
 	    // upload file
-	    NodeKey nodeKey = uploadFormFile(file);
-	    image.setFileName(file.getFileName());
+	    NodeKey nodeKey = uploadMultipartFile(file);
+	    image.setFileName(file.getOriginalFilename());
 	    image.setOriginalFileUuid(nodeKey.getUuid());
-	    String fileName = file.getFileName();
+	    String fileName = file.getOriginalFilename();
 
-	    
 	    InputStream originalIS = imageGalleryToolContentHandler.getFileNode(nodeKey.getUuid()).getFile();
 	    BufferedImage originalImage = ImageIO.read(originalIS);
 	    //throw exception if image was not successfully read
@@ -569,21 +569,20 @@
 	    //store orginalImageWidth and orginalImageHeight
 	    image.setOriginalImageWidth(originalImage.getWidth(null));
 	    image.setOriginalImageHeight(originalImage.getHeight(null));
-	    
+
 	    // prepare medium image
 	    InputStream mediumIS = ResizePictureUtil.resize(originalImage, mediumImageDimensions);
 	    String mediumFileName = ImageGalleryServiceImpl.MEDIUM_FILENAME_PREFIX
 		    + fileName.substring(0, fileName.indexOf('.')) + ".jpg";
-	    NodeKey mediumNodeKey = imageGalleryToolContentHandler.uploadFile(mediumIS, mediumFileName,
-		    "image/jpeg");
+	    NodeKey mediumNodeKey = imageGalleryToolContentHandler.uploadFile(mediumIS, mediumFileName, "image/jpeg");
 	    image.setMediumFileUuid(mediumNodeKey.getUuid());
 	    //store MediumImageWidth and MediumImageHeight
 	    InputStream mediumIS2 = imageGalleryToolContentHandler.getFileNode(mediumNodeKey.getUuid()).getFile();
 	    BufferedImage mediumImage = ImageIO.read(mediumIS2);
 	    image.setMediumImageWidth(mediumImage.getWidth(null));
 	    image.setMediumImageHeight(mediumImage.getHeight(null));
 	    mediumIS2.close();
-	    
+
 	    // prepare thumbnail image
 	    InputStream originalIS2 = imageGalleryToolContentHandler.getFileNode(nodeKey.getUuid()).getFile();
 	    InputStream thumbnailIS = ResizePictureUtil.resize(originalIS2, thumbnailImageDimensions);
@@ -612,15 +611,15 @@
      * @throws RepositoryCheckedException
      * @throws InvalidParameterException
      */
-    private NodeKey uploadFormFile(FormFile file) throws UploadImageGalleryFileException {
-	if ((file == null) || StringUtils.isEmpty(file.getFileName())) {
+    private NodeKey uploadMultipartFile(MultipartFile file) throws UploadImageGalleryFileException {
+	if ((file == null) || StringUtils.isEmpty(file.getOriginalFilename())) {
 	    throw new UploadImageGalleryFileException(
 		    messageService.getMessage("error.msg.upload.file.not.found", new Object[] { file }));
 	}
 
 	NodeKey node = null;
 	try {
-	    node = imageGalleryToolContentHandler.uploadFile(file.getInputStream(), file.getFileName(),
+	    node = imageGalleryToolContentHandler.uploadFile(file.getInputStream(), file.getOriginalFilename(),
 		    file.getContentType());
 	} catch (InvalidParameterException e) {
 	    throw new UploadImageGalleryFileException(messageService.getMessage("error.msg.invaid.param.upload"));
@@ -638,10 +637,10 @@
     public boolean isGroupedActivity(long toolContentID) {
 	return toolService.isGroupedActivity(toolContentID);
     }
-    
+
     @Override
     public void auditLogStartEditingActivityInMonitor(long toolContentID) {
-    	toolService.auditLogStartEditingActivityInMonitor(toolContentID);
+	toolService.auditLogStartEditingActivityInMonitor(toolContentID);
     }
 
     @Override
@@ -732,9 +731,9 @@
 	Set<LearnerItemRatingCriteria> criterias = toolContentObj.getRatingCriterias();
 	if (criterias != null) {
 	    for (LearnerItemRatingCriteria criteria : criterias) {
-	    criteria.setToolContentId(null);
+		criteria.setToolContentId(null);
+	    }
 	}
-	}
 
 	// set ImageGalleryToolContentHandler as null to avoid copy file node in repository again.
 	toolContentObj = ImageGallery.newInstance(toolContentObj, toolContentId);
@@ -1055,12 +1054,12 @@
     public ToolOutput getToolOutput(String name, Long toolSessionId, Long learnerId) {
 	return imageGalleryOutputFactory.getToolOutput(name, this, toolSessionId, learnerId);
     }
-    
+
     @Override
     public List<ToolOutput> getToolOutputs(String name, Long toolContentId) {
-	return new ArrayList<ToolOutput>();
+	return new ArrayList<>();
     }
-    
+
     @Override
     public List<ConfidenceLevelDTO> getConfidenceLevels(Long toolSessionId) {
 	return null;
@@ -1086,20 +1085,23 @@
 	    if (item.getCreateBy().getUserId() == learnerId) {
 		Date newDate = item.getCreateDate();
 		if (newDate != null) {
-		    if (startDate == null || newDate.before(startDate))
+		    if (startDate == null || newDate.before(startDate)) {
 			startDate = newDate;
-		    if (endDate == null || newDate.after(endDate))
+		    }
+		    if (endDate == null || newDate.after(endDate)) {
 			endDate = newDate;
+		    }
 		}
 	    }
 	}
 
-	if (learner.isSessionFinished())
+	if (learner.isSessionFinished()) {
 	    return new ToolCompletionStatus(ToolCompletionStatus.ACTIVITY_COMPLETED, startDate, endDate);
-	else
+	} else {
 	    return new ToolCompletionStatus(ToolCompletionStatus.ACTIVITY_ATTEMPTED, startDate, null);
+	}
     }
-    
+
     /* =================================================================================== */
 
     public IExportToolContentService getExportContentService() {
@@ -1160,7 +1162,7 @@
 
     @Override
     public Set<ImageGalleryItem> getImagesForGroup(ImageGallery imageGallery, Long sessionId) {
-	TreeSet<ImageGalleryItem> images = new TreeSet<ImageGalleryItem>(new ImageGalleryItemComparator());
+	TreeSet<ImageGalleryItem> images = new TreeSet<>(new ImageGalleryItemComparator());
 
 	List<ImageGalleryUser> grouppedUsers = getUserListBySessionId(sessionId);
 	Set<ImageGalleryItem> allImages = imageGallery.getImageGalleryItems();
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/util/ImageGalleryUtils.java
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r9e395fca5d7eb4a5ac4c9768642a336723a950f7
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/util/ImageGalleryUtils.java	(.../ImageGalleryUtils.java)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/util/ImageGalleryUtils.java	(.../ImageGalleryUtils.java)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
@@ -4,93 +4,92 @@
 import java.util.List;
 
 import org.apache.commons.lang.StringUtils;
-import org.apache.struts.action.ActionErrors;
-import org.apache.struts.action.ActionMessage;
-import org.apache.struts.action.ActionMessages;
-import org.apache.struts.upload.FormFile;
-import org.lamsfoundation.lams.tool.imageGallery.ImageGalleryConstants;
 import org.lamsfoundation.lams.tool.imageGallery.web.form.ImageGalleryItemForm;
 import org.lamsfoundation.lams.tool.imageGallery.web.form.MultipleImagesForm;
-import org.lamsfoundation.lams.util.FileValidatorUtil;
+import org.lamsfoundation.lams.util.FileValidatorSpringUtil;
+import org.lamsfoundation.lams.util.MessageService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.multipart.MultipartFile;
 
 public class ImageGalleryUtils {
+
+    @Autowired
+    @Qualifier("laimagMessageService")
+    private static MessageService messageService;
+
     /**
      * Validate imageGallery item.
-     *
-     * @param itemForm
-     * @return
      */
-    public static ActionErrors validateImageGalleryItem(ImageGalleryItemForm itemForm, boolean largeFile) {
-	ActionErrors errors = new ActionErrors();
+    public static MultiValueMap<String, String> validateImageGalleryItem(ImageGalleryItemForm itemForm,
+	    boolean largeFile) {
 
+	MultiValueMap<String, String> errorMap = new LinkedMultiValueMap<>();
+
 	// validate file size
-	FileValidatorUtil.validateFileSize(itemForm.getFile(), largeFile, errors);
+	FileValidatorSpringUtil.validateFileSize(itemForm.getFile(), largeFile);
 	// for edit validate: file already exist
 	if (!itemForm.isHasFile()
-		&& ((itemForm.getFile() == null) || StringUtils.isEmpty(itemForm.getFile().getFileName()))) {
-	    errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(ImageGalleryConstants.ERROR_MSG_FILE_BLANK));
+		&& ((itemForm.getFile() == null) || StringUtils.isEmpty(itemForm.getFile().getOriginalFilename()))) {
+	    errorMap.add("GLOBAL", messageService.getMessage("error.resource.item.file.blank"));
 	}
 
 	// check for allowed format : gif, png, jpg
 	if (itemForm.getFile() != null) {
 	    String contentType = itemForm.getFile().getContentType();
-	    if (isContentTypeForbidden(contentType)) {
-		errors.add(ActionMessages.GLOBAL_MESSAGE,
-			new ActionMessage(ImageGalleryConstants.ERROR_MSG_NOT_ALLOWED_FORMAT));
+	    if (ImageGalleryUtils.isContentTypeForbidden(contentType)) {
+		errorMap.add("GLOBAL", messageService.getMessage("error.resource.image.not.alowed.format"));
 	    }
 	}
 
-	return errors;
+	return errorMap;
     }
 
     /**
      * Validate imageGallery item.
-     *
-     * @param multipleForm
-     * @return
      */
-    public static ActionErrors validateMultipleImages(MultipleImagesForm multipleForm, boolean largeFile) {
-	ActionErrors errors = new ActionErrors();
+    public static MultiValueMap<String, String> validateMultipleImages(MultipleImagesForm multipleForm,
+	    boolean largeFile) {
 
-	List<FormFile> fileList = createFileListFromMultipleForm(multipleForm);
+	MultiValueMap<String, String> errorMap = new LinkedMultiValueMap<>();
 
+	List<MultipartFile> fileList = ImageGalleryUtils.createFileListFromMultipleForm(multipleForm);
+
 	// validate files size
-	for (FormFile file : fileList) {
-	    FileValidatorUtil.validateFileSize(file, largeFile, errors);
+	for (MultipartFile file : fileList) {
+	    FileValidatorSpringUtil.validateFileSize(file, largeFile);
 
 	    // check for allowed format : gif, png, jpg
 	    String contentType = file.getContentType();
-	    if (isContentTypeForbidden(contentType)) {
-		errors.add(ActionMessages.GLOBAL_MESSAGE,
-			new ActionMessage(ImageGalleryConstants.ERROR_MSG_NOT_ALLOWED_FORMAT_FOR, file.getFileName()));
+	    if (ImageGalleryUtils.isContentTypeForbidden(contentType)) {
+		errorMap.add("GLOBAL", messageService.getMessage("error.resource.image.not.alowed.format.for"));
 	    }
 	}
 
-	return errors;
+	return errorMap;
     }
 
     /**
      * Create file list from multiple form.
-     *
-     * @param multipleForm
-     * @return
      */
-    public static List<FormFile> createFileListFromMultipleForm(MultipleImagesForm multipleForm) {
+    public static List<MultipartFile> createFileListFromMultipleForm(MultipleImagesForm multipleForm) {
 
-	List<FormFile> fileList = new ArrayList<FormFile>();
-	if (multipleForm.getFile1() != null && !StringUtils.isEmpty(multipleForm.getFile1().getFileName())) {
+	List<MultipartFile> fileList = new ArrayList<>();
+	if (multipleForm.getFile1() != null && !StringUtils.isEmpty(multipleForm.getFile1().getOriginalFilename())) {
 	    fileList.add(multipleForm.getFile1());
 	}
-	if (multipleForm.getFile2() != null && !StringUtils.isEmpty(multipleForm.getFile2().getFileName())) {
+	if (multipleForm.getFile2() != null && !StringUtils.isEmpty(multipleForm.getFile2().getOriginalFilename())) {
 	    fileList.add(multipleForm.getFile2());
 	}
-	if (multipleForm.getFile3() != null && !StringUtils.isEmpty(multipleForm.getFile3().getFileName())) {
+	if (multipleForm.getFile3() != null && !StringUtils.isEmpty(multipleForm.getFile3().getOriginalFilename())) {
 	    fileList.add(multipleForm.getFile3());
 	}
-	if (multipleForm.getFile4() != null && !StringUtils.isEmpty(multipleForm.getFile4().getFileName())) {
+	if (multipleForm.getFile4() != null && !StringUtils.isEmpty(multipleForm.getFile4().getOriginalFilename())) {
 	    fileList.add(multipleForm.getFile4());
 	}
-	if (multipleForm.getFile5() != null && !StringUtils.isEmpty(multipleForm.getFile5().getFileName())) {
+	if (multipleForm.getFile5() != null && !StringUtils.isEmpty(multipleForm.getFile5().getOriginalFilename())) {
 	    fileList.add(multipleForm.getFile5());
 	}
 
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/form/AdminForm.java
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r9e395fca5d7eb4a5ac4c9768642a336723a950f7
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/form/AdminForm.java	(.../AdminForm.java)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/form/AdminForm.java	(.../AdminForm.java)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
@@ -20,32 +20,36 @@
  * ****************************************************************
  */
 
-
 package org.lamsfoundation.lams.tool.imageGallery.web.form;
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.struts.action.ActionErrors;
-import org.apache.struts.action.ActionForm;
-import org.apache.struts.action.ActionMapping;
-import org.apache.struts.action.ActionMessage;
-import org.apache.struts.action.ActionMessages;
+import org.lamsfoundation.lams.util.MessageService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
 
 /**
  *
  */
-public class AdminForm extends ActionForm {
+public class AdminForm {
+
+    @Autowired
+    @Qualifier("laimagMessageService")
+    private static MessageService messageService;
+
     private static final long serialVersionUID = 414425664356226L;
 
     private String mediumImageDimensions;
 
     private String thumbnailImageDimensions;
 
-    @Override
-    public ActionErrors validate(ActionMapping arg0, HttpServletRequest arg1) {
-	ActionErrors ac = new ActionErrors();
-	ac.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("this is an error"));
-	return ac;
+    public MultiValueMap<String, String> validate(HttpServletRequest arg1) {
+
+	MultiValueMap<String, String> errorMap = new LinkedMultiValueMap<>();
+	errorMap.add("GLOBAL", messageService.getMessage("this is an error"));
+	return errorMap;
     }
 
     public String getMediumImageDimensions() {
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/form/ImageGalleryForm.java
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r9e395fca5d7eb4a5ac4c9768642a336723a950f7
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/form/ImageGalleryForm.java	(.../ImageGalleryForm.java)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/form/ImageGalleryForm.java	(.../ImageGalleryForm.java)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
@@ -27,10 +27,8 @@
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
-import org.apache.struts.action.ActionForm;
-import org.apache.struts.action.ActionMapping;
-import org.apache.struts.upload.FormFile;
 import org.lamsfoundation.lams.tool.imageGallery.model.ImageGallery;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
  *
@@ -40,7 +38,7 @@
  *
  * User: Andrey Balan
  */
-public class ImageGalleryForm extends ActionForm {
+public class ImageGalleryForm {
     private static final long serialVersionUID = 3599879328307492312L;
 
     private static Logger logger = Logger.getLogger(ImageGalleryForm.class.getName());
@@ -49,8 +47,8 @@
     private String sessionMapID;
     private String contentFolderID;
     private int currentTab;
-    private FormFile offlineFile;
-    private FormFile onlineFile;
+    private MultipartFile offlineFile;
+    private MultipartFile onlineFile;
 
     private ImageGallery imageGallery;
     private boolean allowRatingsOrVote;
@@ -69,12 +67,11 @@
 	}
     }
 
-    @Override
-    public void reset(ActionMapping mapping, HttpServletRequest request) {
-	String param = mapping.getParameter();
+    public void reset(HttpServletRequest request) {
+	String param = (String) request.getAttribute("action");
 	// if it is start page, all data read out from database or current session
 	// so need not reset checkbox to refresh value!
-	if (!StringUtils.equals(param, "start") && !StringUtils.equals(param, "initPage")) {
+	if (!StringUtils.equals(param, "start.do") && !StringUtils.equals(param, "initPage.do")) {
 	    imageGallery.setAllowShareImages(false);
 	    imageGallery.setLockWhenFinished(false);
 	    imageGallery.setDefineLater(false);
@@ -91,19 +88,19 @@
 	this.currentTab = currentTab;
     }
 
-    public FormFile getOfflineFile() {
+    public MultipartFile getOfflineFile() {
 	return offlineFile;
     }
 
-    public void setOfflineFile(FormFile offlineFile) {
+    public void setOfflineFile(MultipartFile offlineFile) {
 	this.offlineFile = offlineFile;
     }
 
-    public FormFile getOnlineFile() {
+    public MultipartFile getOnlineFile() {
 	return onlineFile;
     }
 
-    public void setOnlineFile(FormFile onlineFile) {
+    public void setOnlineFile(MultipartFile onlineFile) {
 	this.onlineFile = onlineFile;
     }
 
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/form/ImageGalleryItemForm.java
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r9e395fca5d7eb4a5ac4c9768642a336723a950f7
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/form/ImageGalleryItemForm.java	(.../ImageGalleryItemForm.java)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/form/ImageGalleryItemForm.java	(.../ImageGalleryItemForm.java)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
@@ -23,16 +23,15 @@
 
 package org.lamsfoundation.lams.tool.imageGallery.web.form;
 
-import org.apache.struts.action.ActionForm;
-import org.apache.struts.upload.FormFile;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
  * ImageGallery Item Form.
  *
  *
  * @author Andrey Balan
  */
-public class ImageGalleryItemForm extends ActionForm {
+public class ImageGalleryItemForm {
     private String imageIndex;
     private String sessionMapID;
 
@@ -45,7 +44,7 @@
     private boolean hasFile;
     private Long fileUuid;
     private String fileName;
-    private FormFile file;
+    private MultipartFile file;
 
     //used only in monitoring
     private String imageUid;
@@ -125,11 +124,11 @@
 	this.hasFile = hasFile;
     }
 
-    public FormFile getFile() {
+    public MultipartFile getFile() {
 	return file;
     }
 
-    public void setFile(FormFile file) {
+    public void setFile(MultipartFile file) {
 	this.file = file;
     }
 
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/form/ImageRatingForm.java
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r9e395fca5d7eb4a5ac4c9768642a336723a950f7
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/form/ImageRatingForm.java	(.../ImageRatingForm.java)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/form/ImageRatingForm.java	(.../ImageRatingForm.java)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
@@ -20,18 +20,15 @@
  * ****************************************************************
  */
 
-
 package org.lamsfoundation.lams.tool.imageGallery.web.form;
 
-import org.apache.struts.action.ActionForm;
-
 /**
  * Image star rating Form.
  *
  *
  * @author Andrey Balan
  */
-public class ImageRatingForm extends ActionForm {
+public class ImageRatingForm {
 
     private static final long serialVersionUID = -8962161058929959289L;
 
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/form/MultipleImagesForm.java
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r9e395fca5d7eb4a5ac4c9768642a336723a950f7
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/form/MultipleImagesForm.java	(.../MultipleImagesForm.java)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/form/MultipleImagesForm.java	(.../MultipleImagesForm.java)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
@@ -20,19 +20,17 @@
  * ****************************************************************
  */
 
-
 package org.lamsfoundation.lams.tool.imageGallery.web.form;
 
-import org.apache.struts.action.ActionForm;
-import org.apache.struts.upload.FormFile;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
  * Multiple Images Form.
  *
  *
  * @author Andrey Balan
  */
-public class MultipleImagesForm extends ActionForm {
+public class MultipleImagesForm {
 
     private static final long serialVersionUID = -5595679171112282994L;
 
@@ -42,11 +40,11 @@
     private boolean hasFile;
     private Long fileUuid;
     private String fileName;
-    private FormFile file1;
-    private FormFile file2;
-    private FormFile file3;
-    private FormFile file4;
-    private FormFile file5;
+    private MultipartFile file1;
+    private MultipartFile file2;
+    private MultipartFile file3;
+    private MultipartFile file4;
+    private MultipartFile file5;
 
     //used only in monitoring
     private String imageUid;
@@ -83,43 +81,43 @@
 	this.hasFile = hasFile;
     }
 
-    public FormFile getFile1() {
+    public MultipartFile getFile1() {
 	return file1;
     }
 
-    public void setFile1(FormFile file) {
+    public void setFile1(MultipartFile file) {
 	this.file1 = file;
     }
 
-    public FormFile getFile2() {
+    public MultipartFile getFile2() {
 	return file2;
     }
 
-    public void setFile2(FormFile file) {
+    public void setFile2(MultipartFile file) {
 	this.file2 = file;
     }
 
-    public FormFile getFile3() {
+    public MultipartFile getFile3() {
 	return file3;
     }
 
-    public void setFile3(FormFile file) {
+    public void setFile3(MultipartFile file) {
 	this.file3 = file;
     }
 
-    public FormFile getFile4() {
+    public MultipartFile getFile4() {
 	return file4;
     }
 
-    public void setFile4(FormFile file) {
+    public void setFile4(MultipartFile file) {
 	this.file4 = file;
     }
 
-    public FormFile getFile5() {
+    public MultipartFile getFile5() {
 	return file5;
     }
 
-    public void setFile5(FormFile file) {
+    public void setFile5(MultipartFile file) {
 	this.file5 = file;
     }
 
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/form/ReflectionForm.java
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r9e395fca5d7eb4a5ac4c9768642a336723a950f7
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/form/ReflectionForm.java	(.../ReflectionForm.java)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/form/ReflectionForm.java	(.../ReflectionForm.java)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
@@ -21,11 +21,9 @@
  * ****************************************************************
  */
 
-
 package org.lamsfoundation.lams.tool.imageGallery.web.form;
 
 import org.apache.log4j.Logger;
-import org.apache.struts.validator.ValidatorForm;
 
 /**
  *
@@ -34,7 +32,8 @@
  *
  *
  */
-public class ReflectionForm extends ValidatorForm {
+public class ReflectionForm {
+
     private static final long serialVersionUID = -9054365604649146735L;
     private static Logger logger = Logger.getLogger(ReflectionForm.class.getName());
 
Index: lams_tool_images/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r9e395fca5d7eb4a5ac4c9768642a336723a950f7
--- lams_tool_images/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_images/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
@@ -32,7 +32,6 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-html" prefix="html" %>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="formID" required="true" rtexprvalue="true" %>
@@ -123,11 +122,11 @@
     }  				
 </script>	
 <div id="saveCancelButtons" >
-		<html:link href="javascript:doSubmit_Form_Only();" styleId="saveButton" property="submit" styleClass="btn btn-primary pull-right">
+		<a href="javascript:doSubmit_Form_Only();" id="saveButton" name="submit" class="btn btn-primary pull-right">
 			<span class="okIcon"><fmt:message key="${saveButtonLabelKey}" /></span>
-		</html:link>
-		<html:link href="javascript:;" property="cancel" styleId="cancelButton" onclick="javascript:doCancel()" styleClass="btn btn-default roffset5 pull-right">
+		</a>
+		<a href="javascript:;" name="cancel" id="cancelButton" onclick="javascript:doCancel()" class="btn btn-default roffset5 pull-right">
 			<span class="cancelIcon"><fmt:message key="${cancelButtonLabelKey}" /></span>
-		</html:link>
+		</a>
 </div>
 <!-- end tab content -->
\ No newline at end of file
Index: lams_tool_images/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r9e395fca5d7eb4a5ac4c9768642a336723a950f7
--- lams_tool_images/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_images/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
@@ -8,7 +8,6 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-html" prefix="html" %>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_images/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r9e395fca5d7eb4a5ac4c9768642a336723a950f7
--- lams_tool_images/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_images/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
@@ -8,9 +8,9 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-html" prefix="html" %>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <c:set var="lams"><lams:LAMSURL/></c:set>
 
 <%@ attribute name="criterias" required="true" rtexprvalue="true" type="java.util.Collection" %>
@@ -284,42 +284,38 @@
 					<label for="minimum-rates">
 						<fmt:message key="${minimumLabel}" />
 					</label>
-					<html:select property="${formContentPrefix}minimumRates" styleId="minimum-rates" onmouseup="validateRatingLimits(true);" 
-							styleClass="form-control form-control-inline">
-						<html:option value="0">
-							<fmt:message key="${noMinimumLabel}" />
-						</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:select path="${formContentPrefix}minimumRates" id="minimum-rates" multiple="multiple" onmouseup="validateRatingLimits(true);" 
+							cssClass="form-control form-control-inline">
+						<form:option value="0"><fmt:message key='${noMinimumLabel}' /></form:option>
+						<form:option value="1">1</form:option>
+						<form:option value="2" label="2"/>
+						<form:option value="3" label="3"/>
+						<form:option value="4" label="4"/>
+						<form:option value="5" label="5"/>
+						<form:option value="6" label="6"/>
+						<form:option value="7" label="7"/>
+						<form:option value="8" label="8"/>
+						<form:option value="9" label="9"/>
+						<form:option value="10" label="10"/>
+					</form:select>
 				
 					<label for="maximum-rates">
 						<fmt:message key="${maximumLabel}" />
 					</label>
-					<html:select property="${formContentPrefix}maximumRates" styleId="maximum-rates" onmouseup="validateRatingLimits(false);" 
-							styleClass="form-control form-control-inline">
-						<html:option value="0">
-							<fmt:message key="${noMaximumLabel}" />
-						</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:select path="${formContentPrefix}maximumRates" id="maximum-rates" multiple="multiple" onmouseup="validateRatingLimits(false);" 
+							cssClass="form-control form-control-inline">
+						<form:option value="0"><fmt:message key='${noMaximumLabel}' /></form:option>
+						<form:option value="1" label="1"/>
+						<form:option value="2" label="2"/>
+						<form:option value="3" label="3"/>
+						<form:option value="4" label="4"/>
+						<form:option value="5" label="5"/>
+						<form:option value="6" label="6"/>
+						<form:option value="7" label="7"/>
+						<form:option value="8" label="8"/>
+						<form:option value="9" label="9"/>
+						<form:option value="10" label="10"/>
+					</form:select>
 				</div>
 			</c:if>
 	
Index: lams_tool_images/web/WEB-INF/tags/CommentsAuthor.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r9e395fca5d7eb4a5ac4c9768642a336723a950f7
--- lams_tool_images/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_images/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
@@ -42,23 +42,21 @@
 
 <div class="checkbox">
 	<label>
-	<html:checkbox property="${allowCommentsVariableName}" value="1"
-		styleId="${allowCommentsVariableName}">
-	</html:checkbox>
+	<form:checkbox path="${allowCommentsVariableName}" value="1"
+		id="${allowCommentsVariableName}"/>
 	<fmt:message key="${allowCommentLabelKey}"/>
 	</label>
 </div>
 
 <div id="likedislike">
 <div class="loffset20">
-		<html:radio property="${likeDislikeVariableName}" value="false" />&nbsp;<fmt:message key="${likeOnlyCommentLabelKey}" /> &nbsp;
-		<html:radio property="${likeDislikeVariableName}" value="true" />&nbsp;<fmt:message key="${likeDislikeLabelKey}" /> 
+		<form:radiobutton path="${likeDislikeVariableName}" value="false" />&nbsp;<fmt:message key="${likeOnlyCommentLabelKey}" /> &nbsp;
+		<form:radiobutton path="${likeDislikeVariableName}" value="true" />&nbsp;<fmt:message key="${likeDislikeLabelKey}" /> 
 </div>
 <div class="checkbox">
 	<label>
-	<html:checkbox property="${allowAnonymousVariableName}" 
-		styleId="${allowAnonymousVariableName}">
-	</html:checkbox>
+	<form:checkbox path="${allowAnonymousVariableName}" 
+		id="${allowAnonymousVariableName}"/>
 	<fmt:message key="${allowAnonymousLabelKey}"/>
 	</label>
 </div>
Index: lams_tool_images/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r9e395fca5d7eb4a5ac4c9768642a336723a950f7
--- lams_tool_images/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_images/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
@@ -4,6 +4,7 @@
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="type" required="true" rtexprvalue="true"%>
+<%@ attribute name="formID" required="false" rtexprvalue="true"%>
 <%@ attribute name="style" required="false" rtexprvalue="true"%>
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
@@ -88,8 +89,8 @@
 					</c:if>
 				</c:if>
 			</c:if>
-			<c:if test="${empty toolSessionId}">
-				<c:set var="toolForm" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+			<c:if test="${empty toolSessionId and not empty formID}">
+				<c:set var="toolForm" value="${requestScope[formID]}" />
 				<c:if test="${not empty toolForm}"> 
 				    <c:set var="toolSessionId"><c:catch var="exception">${toolForm.toolSessionID}</c:catch></c:set>
 				</c:if>
@@ -434,4 +435,4 @@
 		</div>
 		</div>
 	</c:otherwise>
-</c:choose>
+</c:choose>
\ No newline at end of file
Index: lams_tool_images/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r9e395fca5d7eb4a5ac4c9768642a336723a950f7
--- lams_tool_images/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_images/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
@@ -8,7 +8,6 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-html" prefix="html" %>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_images/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r9e395fca5d7eb4a5ac4c9768642a336723a950f7
--- lams_tool_images/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_images/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
@@ -8,7 +8,6 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-html" prefix="html" %>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_images/web/WEB-INF/tags/TabBody.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r9e395fca5d7eb4a5ac4c9768642a336723a950f7
--- lams_tool_images/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_images/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
@@ -34,7 +34,6 @@
 <%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="page" required="false" rtexprvalue="true"%>
 <%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-bean" prefix="bean"%>
 
 <c:set var="class" value=""/>
 <c:if test="${id == 1}">
Index: lams_tool_images/web/WEB-INF/tags/TabBodyArea.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r9e395fca5d7eb4a5ac4c9768642a336723a950f7
--- lams_tool_images/web/WEB-INF/tags/TabBodyArea.tag	(.../TabBodyArea.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_images/web/WEB-INF/tags/TabBodyArea.tag	(.../TabBodyArea.tag)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
@@ -30,7 +30,6 @@
 
 %>
 <%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-bean" prefix="bean"%>
 
 <div class="panel-body panel-monitor-body">
 	 <jsp:doBody />
Index: lams_tool_images/web/WEB-INF/tags/TextSearch.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r9e395fca5d7eb4a5ac4c9768642a336723a950f7
--- lams_tool_images/web/WEB-INF/tags/TextSearch.tag	(.../TextSearch.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_images/web/WEB-INF/tags/TextSearch.tag	(.../TextSearch.tag)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
@@ -32,12 +32,11 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
 <%-- Required attributes --%>
 <%@ attribute name="sessionMapID" required="true" rtexprvalue="true" %>
-<%@ attribute name="wrapInFormTag" required="true" rtexprvalue="true" %>
 
 <%-- Optional attributes --%>
 <%@ attribute name="action" required="false" rtexprvalue="true" %>
@@ -53,10 +52,10 @@
 
 <%-- Default value for message key --%>
 <c:if test="${empty action}">
-	<c:set var="action" value="authoring/textsearch.do" scope="request"/>
+	<c:set var="action" value="textsearch.do" scope="request"/>
 </c:if>
 <c:if test="${empty cancelAction}">
-	<c:set var="cancelAction" value="authoring/textsearchCancel.do" scope="request"/>
+	<c:set var="cancelAction" value="textsearchCancel.do" scope="request"/>
 </c:if>
 <c:if test="${empty formID}">
 	<c:set var="formID" value="textSearchForm" scope="request"/>
@@ -85,52 +84,40 @@
 
 <!-- begin text search form content -->
 	
-<c:if test="${wrapInFormTag}">
-	<form action="${action}" id="${formID}" name="${formID}">
-</c:if>
-		<html:hidden property="sessionMapID" />
-		<h4><fmt:message key="${headingLabelKey}" /></h4>
-		<table>
-			<tr>
-				<td>
-					<fmt:message key="${allWordsLabelKey}" />
-				</td>
-				<td>
-					<html:text size="40" property="allWords" />
-				</td>
-			</tr>
-			<tr>
-				<td>
-					<fmt:message key="${phraseLabelKey}" />
-				</td>
-				<td>
-					<html:text size="40" property="phrase" />
-				</td>
-			</tr>
-			<tr>
-				<td>
-					<fmt:message key="${anyWordsLabelKey}" />
-				</td>
-				<td>
-					<html:text size="40" property="anyWords" /> 
-				</td>
-			</tr>
-			<tr>
-				<td>
-					<fmt:message key="${excludedWordsLabelKey}" />
-				</td>
-				<td>
-					<html:text size="40" property="excludedWords" /> 
-				</td>
-			</tr>
-		</table>
-<c:if test="${wrapInFormTag}">
-	<lams:ImgButtonWrapper>
-		<a href="#" onclick="${formID}.submit();" class="button-add-item"><fmt:message key="${saveButtonLabelKey}" />
-		</a>
-		<a href="#" onclick="location.href='${cancelAction}'" class="button space-left"><fmt:message key="${cancelButtonLabelKey}" />
-		</a>
-	</lams:ImgButtonWrapper>
-	</form>
-</c:if>
+	<form:hidden path="sessionMapID" />
+	<h4><fmt:message key="${headingLabelKey}" /></h4>
+	<table>
+		<tr>
+			<td>
+				<fmt:message key="${allWordsLabelKey}" />
+			</td>
+			<td>
+				<form:input size="40" path="allWords" />
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<fmt:message key="${phraseLabelKey}" />
+			</td>
+			<td>
+				<form:input size="40" path="phrase" />
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<fmt:message key="${anyWordsLabelKey}" />
+			</td>
+			<td>
+				<form:input size="40" path="anyWords" /> 
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<fmt:message key="${excludedWordsLabelKey}" />
+			</td>
+			<td>
+				<form:input size="40" path="excludedWords" /> 
+			</td>
+		</tr>
+	</table>
 <!-- end text search form content -->
\ No newline at end of file
Index: lams_tool_images/web/WEB-INF/web.xml
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r9e395fca5d7eb4a5ac4c9768642a336723a950f7
--- lams_tool_images/web/WEB-INF/web.xml	(.../web.xml)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_images/web/WEB-INF/web.xml	(.../web.xml)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
@@ -72,27 +72,12 @@
 		<url-pattern>/*</url-pattern>
 	</filter-mapping>
 
-
 	<servlet>
-		<servlet-name>action</servlet-name>
-		<servlet-class>org.apache.struts.action.ActionServlet</servlet-class>
-		<init-param>
-			<param-name>config</param-name>
-			<param-value>/WEB-INF/struts-config.xml</param-value>
-		</init-param>
-		<init-param>
-			<param-name>debug</param-name>
-			<param-value>999</param-value>
-		</init-param>
-		<init-param>
-			<param-name>detail</param-name>
-			<param-value>1</param-value>
-		</init-param>
-		<init-param>
-			<param-name>validate</param-name>
-			<param-value>true</param-value>
-		</init-param>
-		<load-on-startup>2</load-on-startup>
+		<servlet-name>spring</servlet-name>
+		<servlet-class>
+			org.springframework.web.servlet.DispatcherServlet
+		</servlet-class>
+		<load-on-startup>1</load-on-startup>
 	</servlet>
 
 	<servlet>
@@ -123,7 +108,7 @@
 	</servlet>
 
 	<servlet-mapping>
-		<servlet-name>action</servlet-name>
+		<servlet-name>spring</servlet-name>
 		<url-pattern>*.do</url-pattern>
 	</servlet-mapping>
 
@@ -140,42 +125,6 @@
 
 	<jsp-config>
 		<!-- ======================================================== -->
-		<!-- Struts Tag Library Descriptors -->
-		<!-- ======================================================== -->
-		<taglib>
-			<taglib-uri>tags-bean</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-bean.tld</taglib-location>
-		</taglib>
-		<taglib>
-			<taglib-uri>tags-html</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-html.tld</taglib-location>
-		</taglib>
-		<taglib>
-			<taglib-uri>tags-logic</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-logic.tld</taglib-location>
-		</taglib>
-		<taglib>
-			<taglib-uri>tags-tiles</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-tiles.tld</taglib-location>
-		</taglib>
-
-		<taglib>
-			<taglib-uri>tags-bean-el</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-bean-el.tld</taglib-location>
-		</taglib>
-		<taglib>
-			<taglib-uri>tags-html-el</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-html-el.tld</taglib-location>
-		</taglib>
-		<taglib>
-			<taglib-uri>tags-logic-el</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-logic-el.tld</taglib-location>
-		</taglib>
-		<taglib>
-			<taglib-uri>tags-tiles-el</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-tiles-el.tld</taglib-location>
-		</taglib>
-		<!-- ======================================================== -->
 		<!-- JSTL 1.2 Tag Library -->
 		<!-- ======================================================== -->
 		<taglib>
Index: lams_tool_images/web/common/header.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r9e395fca5d7eb4a5ac4c9768642a336723a950f7
--- lams_tool_images/web/common/header.jsp	(.../header.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_images/web/common/header.jsp	(.../header.jsp)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
@@ -8,7 +8,7 @@
 
  <!-- ********************  javascript ********************** -->
 <script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
-<script type="text/javascript" src="<html:rewrite page='/includes/javascript/imageGallerycommon.js'/>"></script>
+<script type="text/javascript" src="<lams:WebAppURL/>includes/javascript/imageGallerycommon.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/bootstrap.tabcontroller.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
Index: lams_tool_images/web/common/messages.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r9e395fca5d7eb4a5ac4c9768642a336723a950f7
--- lams_tool_images/web/common/messages.jsp	(.../messages.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_images/web/common/messages.jsp	(.../messages.jsp)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
@@ -1,8 +1,10 @@
-<%-- Error Messages --%>
-<logic:messagesPresent>
-	 <lams:Alert id="errorMessages" type="danger" close="false">
-		<html:messages id="error">
-			<c:out value="${error}" escapeXml="false"/><br/>
-		</html:messages>
-	</lams:Alert>
-</logic:messagesPresent>
\ No newline at end of file
+ <%@include file="/common/taglibs.jsp"%>
+ 
+ <c:set var="errorKey" value="GLOBAL" />
+        <c:if test="${not empty errorMap and not empty errorMap[errorKey]}">
+            <lams:Alert id="error" type="danger" close="false">
+                <c:forEach var="error" items="${errorMap[errorKey]}">
+                    <c:out value="${error}" />
+                </c:forEach>
+            </lams:Alert>
+        </c:if>
Index: lams_tool_images/web/common/tabbedheader.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r9e395fca5d7eb4a5ac4c9768642a336723a950f7
--- lams_tool_images/web/common/tabbedheader.jsp	(.../tabbedheader.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_images/web/common/tabbedheader.jsp	(.../tabbedheader.jsp)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
@@ -11,4 +11,4 @@
 <script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/bootstrap.tabcontroller.js"></script>
-<script type="text/javascript" src="<html:rewrite page='/includes/javascript/imageGallerycommon.js'/>"></script>
+<script type="text/javascript" src="<lams:WebAppURL/>includes/javascript/imageGallerycommon.js"></script>
Index: lams_tool_images/web/common/taglibs.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r9e395fca5d7eb4a5ac4c9768642a336723a950f7
--- lams_tool_images/web/common/taglibs.jsp	(.../taglibs.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_images/web/common/taglibs.jsp	(.../taglibs.jsp)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
@@ -1,11 +1,8 @@
 <%@ page language="java" errorPage="/error.jsp" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
-<%@ taglib uri="tags-bean" prefix="bean" %>
-<%@ taglib uri="tags-html" prefix="html" %>
-<%@ taglib uri="tags-logic" prefix="logic" %>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="tags-xml" prefix="x" %>
 <%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 
-
Index: lams_tool_images/web/pages/admin/config.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r9e395fca5d7eb4a5ac4c9768642a336723a950f7
--- lams_tool_images/web/pages/admin/config.jsp	(.../config.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_images/web/pages/admin/config.jsp	(.../config.jsp)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
@@ -12,7 +12,7 @@
 	<body class="stripes">
 
 		<c:set var="title"><fmt:message key="admin.page.title" /></c:set>
-		<lams:Page type="admin" title="${title}">
+		<lams:Page type="admin" title="${title}" formID="imageGalleryAdminForm">
 		
 			<a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default"><fmt:message key="admin.return" /></a>
 
@@ -24,16 +24,16 @@
 				</lams:Alert>
 			</c:if>
 			
-			<html:form action="/laimag10admin/saveContent" styleId="imageGalleryAdminForm" method="post" enctype="multipart/form-data">
+			<form:form action="saveContent.do" modelAttribute="imageGalleryAdminForm" id="imageGalleryAdminForm" method="post" enctype="multipart/form-data">
 				<table class="table table-no-border voffset5">
 					<tr>
 						<td width="30%">
 							<fmt:message key="admin.maximum.dimensions.medium.image" />
 						</td>
 						
 						<td width="70%">
-							<html:text property="mediumImageDimensions" styleClass="form-control" size="50" maxlength="255">
-						</html:text></td>
+							<input type="text" path="mediumImageDimensions" class="form-control" size="50" maxlength="255"/>
+						</td>
 					</tr>
 					
 					<tr>
@@ -42,12 +42,12 @@
 						</td>
 						
 						<td width="70%">
-							<html:text property="thumbnailImageDimensions" styleClass="form-control" size="50" maxlength="255">
-						</html:text></td>
+							<input type="text" path="thumbnailImageDimensions" class="form-control" size="50" maxlength="255"/>
+						</td>
 					</tr>					
 				</table>
-				<html:submit styleClass="btn btn-primary pull-right"><fmt:message key="admin.button.save" /></html:submit>
-			</html:form>
+				<input type="submit" value="<fmt:message key="admin.button.save" />" class="btn btn-primary pull-right"/>
+			</form:form>
 			
 		<div id="footer">
 		</div>
Index: lams_tool_images/web/pages/authoring/advance.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r9e395fca5d7eb4a5ac4c9768642a336723a950f7
--- lams_tool_images/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_images/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
@@ -1,7 +1,8 @@
 <%@ include file="/common/taglibs.jsp"%>
 
 <script lang="javascript">
-	$(document).ready(function() {
+
+$(document).ready(function() {
 	    $('#allowRank').click(function() {
 	        $(".rating-criteria-tag").show("slow");
 	    });
@@ -14,49 +15,48 @@
 	 * Processes mouse click event on allowRatingsOrVote ckeckbox
 	 */
 	function allowRatingsOrVoteClicked() {
-		document.imageGalleryForm.allowVote.disabled = ! eval(document.imageGalleryForm.allowVote.disabled); 
-		document.imageGalleryForm.allowRank.disabled = ! eval(document.imageGalleryForm.allowRank.disabled);
-		if (document.imageGalleryForm.allowRatingsOrVote.checked) {
-			document.imageGalleryForm.allowVote.checked = true;
+		document.forms.imageGalleryForm.allowVote.disabled = ! eval(document.forms.imageGalleryForm.allowVote.disabled); 
+		document.forms.imageGalleryForm.allowRank.disabled = ! eval(document.forms.imageGalleryForm.allowRank.disabled);
+		if (document.forms.imageGalleryForm.allowRatingsOrVote.checked) {
+			document.forms.imageGalleryForm.allowVote.checked = true;
 		} else {
-			document.imageGalleryForm.allowVote.checked = false;
-			document.imageGalleryForm.allowRank.checked = false;
+			document.forms.imageGalleryForm.allowVote.checked = false;
+			document.forms.imageGalleryForm.allowRank.checked = false;
 			$(".rating-criteria-tag").hide("slow");
 		}
 	}
 
 	function uncheckNotifyTeachersOnImageSumbit() {
-		document.imageGalleryForm.notifyTeachersOnImageSumbit.checked = false;
-		document.imageGalleryForm.notifyTeachersOnImageSumbit.disabled = ! eval(document.imageGalleryForm.notifyTeachersOnImageSumbit.disabled);
+		document.forms.imageGalleryForm.notifyTeachersOnImageSumbit.checked = false;
+		document.forms.imageGalleryForm.notifyTeachersOnImageSumbit.disabled = ! eval(document.forms.imageGalleryForm.notifyTeachersOnImageSumbit.disabled);
 	}
 </script>
 	
-<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-<c:set var="sessionMap"	value="${sessionScope[formBean.sessionMapID]}" />
+<c:set var="sessionMap"	value="${sessionScope[imageGalleryForm.sessionMapID]}" />
 
 <!-- Advance Tab Content -->
 
 <lams:SimplePanel titleKey="label.image.options">
 
 <div class="checkbox">
 	<label for="allowShareImages">
-		<html:checkbox property="imageGallery.allowShareImages" styleId="allowShareImages"
+		<form:checkbox path="imageGallery.allowShareImages" id="allowShareImages"
 				onclick="uncheckNotifyTeachersOnImageSumbit();"/>
 		<fmt:message key="label.authoring.advance.allow.learner.share.images" />
 	</label>
 </div>
 
 <div class="checkbox loffset20">
 	<label for="notifyTeachersOnImageSumbit">
-		<html:checkbox property="imageGallery.notifyTeachersOnImageSumbit" styleId="notifyTeachersOnImageSumbit"
-				disabled="${not formBean.imageGallery.allowShareImages}"/>
+		<form:checkbox path="imageGallery.notifyTeachersOnImageSumbit" id="notifyTeachersOnImageSumbit"
+				disabled="${not imageGalleryForm.imageGallery.allowShareImages}"/>
 		<fmt:message key="label.authoring.advance.notify.monitoring.teachers" />
 	</label>
 </div>
 
 <div class="checkbox">
 	<label for="allowRatingsOrVote">
-		<html:checkbox property="allowRatingsOrVote" styleId="allowRatingsOrVote"
+		<form:checkbox path="allowRatingsOrVote" id="allowRatingsOrVote"
 				onclick="allowRatingsOrVoteClicked();"/>
 		<fmt:message key="label.authoring.advance.allow.learner.ratings.or.vote" />
 	</label>
@@ -67,8 +67,8 @@
 	<div class="radio">
 		<label for="allowVote">
 			<input type="radio" name="imageGallery.allowVote" value="${true}" id="allowVote"
-				<c:if test="${formBean.imageGallery.allowVote}">checked="checked"</c:if>
-				<c:if test="${not (formBean.imageGallery.allowVote or formBean.imageGallery.allowRank)}">disabled="disabled"</c:if> 
+				<c:if test="${imageGalleryForm.imageGallery.allowVote}">checked="checked"</c:if>
+				<c:if test="${not (imageGalleryForm.imageGallery.allowVote or imageGalleryForm.imageGallery.allowRank)}">disabled="disabled"</c:if> 
 			/>
 			<fmt:message key="label.authoring.advance.allow.learner.vote" />
 		</label>
@@ -77,14 +77,14 @@
 	<div class="radio">
 		<label for="allowRank">
 			<input type="radio" name="imageGallery.allowVote" value="${false}" id="allowRank"
-				<c:if test="${formBean.imageGallery.allowRank}">checked="checked"</c:if> 
-				<c:if test="${not (formBean.imageGallery.allowVote or formBean.imageGallery.allowRank)}">disabled="disabled"</c:if>		
+				<c:if test="${imageGalleryForm.imageGallery.allowRank}">checked="checked"</c:if> 
+				<c:if test="${not (imageGalleryForm.imageGallery.allowVote or imageGalleryForm.imageGallery.allowRank)}">disabled="disabled"</c:if>		
 			/>
 			<fmt:message key="label.authoring.advance.allow.learner.rank" />
 		</label>
 	</div>
 		
-	<c:if test='${!formBean.imageGallery.allowRank}'><c:set var="styleId">display:none;</c:set></c:if>
+	<c:if test='${!imageGalleryForm.imageGallery.allowRank}'><c:set var="styleId">display:none;</c:set></c:if>
 	<lams:AuthoringRatingCriteria criterias="${sessionMap.ratingCriterias}" hasRatingLimits="true"
 		upLabel="label.authoring.up" downLabel="label.authoring.down"
 		allowCommentsLabel="label.authoring.advance.allow.learner.comment.images"
@@ -99,25 +99,26 @@
 
 <div class="checkbox">
 	<label for="lock-when-finished">
-		<html:checkbox property="imageGallery.lockWhenFinished" styleId="lock-when-finished"/>
+		<form:checkbox path="imageGallery.lockWhenFinished" id="lock-when-finished"/>
 		<fmt:message key="label.authoring.advance.lock.on.finished" />
 	</label>
 </div>
 
 <div class="checkbox">
 	<label for="reflect-on">
-		<html:checkbox property="imageGallery.reflectOnActivity" styleId="reflect-on"/>
+		<form:checkbox path="imageGallery.reflectOnActivity" id="reflect-on"/>
 		<fmt:message key="label.authoring.advanced.reflectOnActivity" />
 	</label>
 </div>
 
 <div class="form-group">
-	<html:textarea property="imageGallery.reflectInstructions" cols="60" rows="3" styleId="reflect-instructions" styleClass="form-control"/>
+	<textarea name="imageGallery.reflectInstructions" cols="60" rows="3" id="reflect-instructions" class="form-control">${imageGalleryForm.imageGallery.reflectInstructions}</textarea>
 </div>
 
 </lams:SimplePanel>
 
 <script type="text/javascript">
+<!--
 	//automatically turn on refect option if there are text input in refect instruction area
 	var ra = document.getElementById("reflect-instructions");
 	var rao = document.getElementById("reflect-on");
@@ -132,4 +133,5 @@
 	}
 
 	ra.onkeyup=turnOnRefect;
+//-->
 </script>
Index: lams_tool_images/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r9e395fca5d7eb4a5ac4c9768642a336723a950f7
--- lams_tool_images/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_images/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
@@ -22,7 +22,7 @@
 		var LABEL_MAX_FILE_SIZE = '<fmt:message key="errors.maxfilesize"/>';
 		var LABEL_NOT_ALLOWED_FORMAT = '<fmt:message key="error.resource.image.not.alowed.format"/>';
 	</script>
-	<script type="text/javascript" src="<html:rewrite page='/includes/javascript/imageGalleryitem.js'/>"></script>
+	<script type="text/javascript" src="<lams:WebAppURL/>includes/javascript/imageGalleryitem.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/upload.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/jquery-ui.js"></script>
 	<script>
@@ -51,16 +51,14 @@
 </lams:head>
 
 <body class="stripes" onLoad="init();">
-	<html:form action="authoring/update" method="post" styleId="authoringForm" enctype="multipart/form-data">
-		<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
+	<form:form action="update.do" method="post" modelAttribute="imageGalleryForm" id="imageGalleryForm" enctype="multipart/form-data">
 	
 		<c:set var="title"><fmt:message key="label.learning.heading" /></c:set>
-		<lams:Page title="${title}" type="navbar">
-			<html:hidden property="imageGallery.contentId"/>
-			<html:hidden property="mode" value="${mode}"/>
-			<html:hidden property="sessionMapID" />
-			<html:hidden property="contentFolderID" />
-			<html:hidden property="currentTab" styleId="currentTab" />
+		<lams:Page title="${title}" type="navbar" formID="imageGalleryForm">
+			<form:hidden path="imageGallery.contentId"/>
+			<form:hidden path="sessionMapID" />
+			<form:hidden path="contentFolderID" />
+			<form:hidden path="currentTab" id="currentTab" />
 	
 			<lams:Tabs control="true" title="${title}" helpToolSignature="<%= ImageGalleryConstants.TOOL_SIGNATURE %>" helpModule="authoring">
 				<lams:Tab id="1" key="label.authoring.heading.basic" />
@@ -78,10 +76,10 @@
 		
 				<!-- Button Row -->
 				<div id="saveCancelButtons">
-					<lams:AuthoringButton formID="authoringForm"
+					<lams:AuthoringButton formID="imageGalleryForm"
 						clearSessionActionUrl="/clearsession.do" toolSignature="<%=ImageGalleryConstants.TOOL_SIGNATURE%>"
-						toolContentID="${formBean.imageGallery.contentId}" accessMode="${mode}" defineLater="${mode=='teacher'}"
-						contentFolderID="${formBean.contentFolderID}" />
+						toolContentID="${imageGalleryForm.imageGallery.contentId}" accessMode="${mode}" defineLater="${mode=='teacher'}"
+						contentFolderID="${imageGalleryForm.contentFolderID}" />
 				</div>
 			</lams:TabBodyArea>
 	
@@ -90,6 +88,6 @@
 		<!-- end page div -->
 		</lams:Page>
 	
-	</html:form>
+	</form:form>
 </body>
 </lams:html>
Index: lams_tool_images/web/pages/authoring/basic.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r9e395fca5d7eb4a5ac4c9768642a336723a950f7
--- lams_tool_images/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_images/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
@@ -1,12 +1,11 @@
 <%@ include file="/common/taglibs.jsp"%>
-<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 
-<link rel="stylesheet" href="<html:rewrite page='/includes/css/lytebox.css'/>"  type="text/css">
+<link rel="stylesheet" href="<lams:WebAppURL/>includes/css/lytebox.css"  type="text/css">
 
 <script type="text/javascript"> 
-	var pathToImageFolder = "<html:rewrite page='/includes/images/'/>"; 
+	var pathToImageFolder = "<lams:WebAppURL/>includes/images/"; 
 </script>
-<script type="text/javascript" src="<html:rewrite page='/includes/javascript/lytebox.js'/>" ></script>
+<script type="text/javascript" src="<lams:WebAppURL />includes/javascript/lytebox.js" ></script>
 <script lang="javascript">
 
 	function hideMessage(){
@@ -83,28 +82,28 @@
     <label for="imageGallery.title">
     	<fmt:message key="label.authoring.basic.title"/>
     </label>
-    <html:text property="imageGallery.title" styleClass="form-control"/>
+    <input type="text" name="imageGallery.title" value="${imageGalleryForm.imageGallery.title}" class="form-control"/>
 </div>
 
 <div class="form-group">
     <label for="imageGallery.instructions">
     	<fmt:message key="label.authoring.basic.instruction"/>
     </label>
-	<lams:CKEditor id="imageGallery.instructions" value="${formBean.imageGallery.instructions}"
-			contentFolderID="${formBean.contentFolderID}">
+	<lams:CKEditor id="imageGallery.instructions" value="${imageGalleryForm.imageGallery.instructions}"
+			contentFolderID="${imageGalleryForm.contentFolderID}">
 	</lams:CKEditor>
 </div>
 
 <div id="imageGalleryListArea">
-	<c:set var="sessionMapID" value="${formBean.sessionMapID}" />
+	<c:set var="sessionMapID" value="${imageGalleryForm.sessionMapID}" />
 	<%@ include file="/pages/authoring/parts/itemlist.jsp"%>
 </div>
 
-<c:url var="showMessageURL" value='/authoring/newImageInit.do'>
-	<c:param name="sessionMapID" value="${formBean.sessionMapID}" />
+<c:url var="showMessageURL" value="/authoring/newImageInit.do">
+	<c:param name="sessionMapID" value="${imageGalleryForm.sessionMapID}" />
 </c:url>
-<html:link href="#nogo" styleClass="btn btn-default btn-sm" onclick="javascript:showMessage('${showMessageURL}')">
+<a href="#nogo" class="btn btn-default btn-sm" onclick="javascript:showMessage('${showMessageURL}')">
 	<i class="fa fa-plus"></i>&nbsp;<fmt:message key="label.authoring.basic.add.image" />
-</html:link>
+</a>
 
 <div id="new-image-input-area" class="voffset10"></div>
Index: lams_tool_images/web/pages/authoring/parts/addimage.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r9e395fca5d7eb4a5ac4c9768642a336723a950f7
--- lams_tool_images/web/pages/authoring/parts/addimage.jsp	(.../addimage.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_images/web/pages/authoring/parts/addimage.jsp	(.../addimage.jsp)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
@@ -1,24 +1,23 @@
 <%@ include file="/common/taglibs.jsp"%>
 <c:choose>
 	<c:when test="${saveUsingLearningAction}">
-		<c:set var="FORM_ACTION" value="/learning/saveNewImage.do"/>
+		<c:set var="FORM_ACTION" value="../learning/saveNewImage.do"/>
 	</c:when>
 	<c:otherwise>
-		<c:set var="FORM_ACTION" value="/authoring/saveOrUpdateImage"/>
+		<c:set var="FORM_ACTION" value="saveOrUpdateImage.do"/>
 	</c:otherwise>
 </c:choose>
 
-<html:form action="${FORM_ACTION}" method="post" styleId="imageGalleryItemForm" enctype="multipart/form-data">
-	<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-	<c:set var="sessionMap"	value="${sessionScope[formBean.sessionMapID]}" />
+<form:form action="${FORM_ACTION}" method="post" modelAttribute="imageGalleryItemForm" id="imageGalleryItemForm" enctype="multipart/form-data">
+	<c:set var="sessionMap"	value="${sessionScope[imageGalleryForm.sessionMapID]}" />
 	
 	<div class="panel panel-default">
 		<div class="panel-heading">
 			<div class="panel-title">
 				<fmt:message key="label.authoring.basic.add.image" />
 				<div class="pull-right">
-					<c:if test="${empty formBean.imageIndex}">
-						<a href="javascript:showMessage('<html:rewrite page="/authoring/initMultipleImages.do?sessionMapID=${formBean.sessionMapID}"/>');" 
+					<c:if test="${empty imageGalleryItemForm.imageIndex}">
+						<a href="javascript:showMessage('<lams:WebAppURL />authoring/initMultipleImages.do?sessionMapID=${imageGalleryItemForm.sessionMapID}');" 
 								class="btn btn-default btn-xs">
 							<fmt:message key="label.authoring.basic.upload.multiple.images" />
 						</a>
@@ -29,14 +28,14 @@
 			
 		<div class="panel-body">
 			<%@ include file="/common/messages.jsp"%>
-			<html:hidden property="sessionMapID" />
-			<html:hidden property="imageIndex" />
+			<form:hidden path="sessionMapID" />
+			<form:hidden path="imageIndex" />
 	
 			<div class="form-group">
 			    <label for="file-title">
 			    	<fmt:message key="label.authoring.basic.resource.title.input"/>
 			    </label>
-			    <html:text property="title" styleClass="form-control input-sm" styleId="file-title" tabindex="1"/>
+			    <input type="text" name="title" value="${imageGalleryItemForm.title}" class="form-control input-sm" id="file-title" tabindex="1"/>
 			</div>
 		
 			<div class="form-group">
@@ -46,18 +45,18 @@
 
 				<c:choose>
 					<c:when test="${saveUsingLearningAction}">
-						<lams:STRUTS-textarea rows="5" tabindex="2" styleClass="text-area form-control" property="description" />
+						<textarea rows="5" tabindex="2" class="text-area form-control" name="description"></textarea>
 					</c:when>
 					<c:otherwise>
-						<lams:CKEditor id="description" value="${formBean.description}" width="99%" 
+						<lams:CKEditor id="description" value="${imageGalleryItemForm.description}" width="99%" 
 							contentFolderID="${sessionMap.imageGalleryForm.contentFolderID}" 
 							resizeParentFrameName="new-image-input-area" />
 					</c:otherwise>
 				</c:choose>
 			</div>
 				
 			<div class="form-group">
-				<c:set var="itemAttachment" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+				<c:set var="itemAttachment" value="${imageGalleryItemForm}"/>
 				<div id="itemAttachmentArea">
 					<%@ include file="/pages/authoring/parts/imagefile.jsp"%>
 				</div>
@@ -79,4 +78,4 @@
 		</div>
 	</div>
 
-</html:form>
\ No newline at end of file
+</form:form>
\ No newline at end of file
Index: lams_tool_images/web/pages/authoring/parts/addmultipleimages.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r9e395fca5d7eb4a5ac4c9768642a336723a950f7
--- lams_tool_images/web/pages/authoring/parts/addmultipleimages.jsp	(.../addmultipleimages.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_images/web/pages/authoring/parts/addmultipleimages.jsp	(.../addmultipleimages.jsp)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
@@ -16,14 +16,13 @@
 	</c:otherwise>
 </c:choose>
 
-<html:form action="/authoring/saveMultipleImages" method="post" styleId="imageGalleryItemsForm" enctype="multipart/form-data">
-	<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+<form:form action="saveMultipleImages.do" method="post" modelAttribute="multipleImagesForm" id="multipleImagesForm" enctype="multipart/form-data">
 	
 	<div class="panel panel-default">
 		<div class="panel-heading">
 			<div class="panel-title">
 				<fmt:message key="label.authoring.basic.add.multiple.images" />
-				<a href="javascript:showMessage('<html:rewrite page="/authoring/newImageInit.do?sessionMapID=${formBean.sessionMapID}"/>');" 
+				<a href="javascript:showMessage('<lams:WebAppURL />authoring/newImageInit.do?sessionMapID=${multipleImagesForm.sessionMapID}');" 
 						class="btn btn-default btn-xs pull-right">
 					<fmt:message key="label.authoring.basic.upload.single.image" />
 				</a>
@@ -33,7 +32,7 @@
 		<div class="panel-body">
 	
 			<%@ include file="/common/messages.jsp"%>	
-			<html:hidden property="sessionMapID" styleId="sessionMapID"/>
+			<form:hidden path="sessionMapID" id="sessionMapID"/>
 	
 			<div class="form-group">
 				<label>
@@ -82,4 +81,4 @@
 		</div>
 	</div>
 	
-</html:form>
+</form:form>
Index: lams_tool_images/web/pages/authoring/parts/imagefile.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r9e395fca5d7eb4a5ac4c9768642a336723a950f7
--- lams_tool_images/web/pages/authoring/parts/imagefile.jsp	(.../imagefile.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_images/web/pages/authoring/parts/imagefile.jsp	(.../imagefile.jsp)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
@@ -24,7 +24,7 @@
 				
 				<td width="3%" align="left">
 					<c:set var="viewURL">
-						<html:rewrite page="/download/?uuid=${itemAttachment.fileUuid}&preferDownload=false" />
+						<lams:WebAppURL />download/?uuid=${itemAttachment.fileUuid}&preferDownload=false
 					</c:set>					
 					<a href="#nogo" onclick="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')" class="btn btn-default btn-xs">
 						<fmt:message key="label.view" />
Index: lams_tool_images/web/pages/authoring/parts/itemlist.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r9e395fca5d7eb4a5ac4c9768642a336723a950f7
--- lams_tool_images/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_images/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
@@ -15,10 +15,10 @@
 				<tr>
 					<td width="4%" >
 						<c:set var="thumbnailPath">
-						   	<html:rewrite page='/download/?uuid='/>${image.thumbnailFileUuid}&preferDownload=false
+						   	<lams:WebAppURL />download/?uuid=${image.thumbnailFileUuid}&preferDownload=false
 						</c:set>
 					 	<c:set var="mediumImagePath">
-		   					<html:rewrite page='/download/?uuid='/>${image.mediumFileUuid}&preferDownload=false
+		   					<lams:WebAppURL />download/?uuid=${image.mediumFileUuid}&preferDownload=false
 						</c:set>					
 						<c:set var="title">
 							<c:out value="${image.title}" escapeXml="true"/>
@@ -30,7 +30,7 @@
 					
 					<td>
 						<a href="${mediumImagePath}" rel="lyteframe" title="${title}" rev="width: ${image.mediumImageWidth + 20}px; height: ${image.mediumImageHeight + 30}px; scrolling: auto;">
-							<c:out value="${image.title}" escapeXml="true"/>
+							<c:out value="${title}" escapeXml="true"/>
 						</a>
 					</td>
 					
Index: lams_tool_images/web/pages/authoring/start.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r9e395fca5d7eb4a5ac4c9768642a336723a950f7
--- lams_tool_images/web/pages/authoring/start.jsp	(.../start.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_images/web/pages/authoring/start.jsp	(.../start.jsp)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
@@ -2,10 +2,10 @@
 <%@ include file="/common/taglibs.jsp" %>
 <html>
 <body class="stripes">
-	<html:form action="/authoring/init.do?mode=${mode}" method="post" styleId="startForm">
-		<html:hidden property="imageGallery.contentId"/>
-		<html:hidden property="sessionMapID"/>
-	</html:form>
+	<form:form action="init.do?mode=${mode}" method="post" modelAttribute="imageGalleryForm" id="startForm">
+		<form:hidden path="imageGallery.contentId"/>
+		<form:hidden path="sessionMapID"/>
+	</form:form>
 	
 	<script type="text/javascript">
 		document.getElementById("startForm").submit();
Index: lams_tool_images/web/pages/learning/learning.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r9e395fca5d7eb4a5ac4c9768642a336723a950f7
--- lams_tool_images/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_images/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
@@ -32,8 +32,8 @@
 	<c:set var="mediumImageDimensions" value="${sessionMap.mediumImageDimensions}" />
 	<c:set var="thumbnailImageDimensions" value="${empty sessionMap.thumbnailImageDimensions ? 100 : sessionMap.thumbnailImageDimensions}" />
 
-	<link rel="stylesheet" type="text/css" href="<html:rewrite page='/includes/css/fotorama.css'/>"/>
-	<link href="<html:rewrite page='/includes/css/imageGallery.css'/>" rel="stylesheet" type="text/css">
+	<link rel="stylesheet" type="text/css" href="<lams:WebAppURL/>/includes/css/fotorama.css"/>
+	<link href="<lams:WebAppURL/>includes/css/imageGallery.css" rel="stylesheet" type="text/css">
 	
     <lams:css suffix="jquery.jRating"/>
 	<link rel="stylesheet" type="text/css" href="${lams}css/jquery.tablesorter.theme-blue.css">
@@ -47,11 +47,11 @@
 		var LABEL_MAX_FILE_SIZE = '<fmt:message key="errors.maxfilesize"><param>{0}</param></fmt:message>';
 		var LABEL_NOT_ALLOWED_FORMAT = '<fmt:message key="error.resource.image.not.alowed.format"/>';
 	</script>
-	<script type="text/javascript" src="<html:rewrite page='/includes/javascript/imageGalleryitem.js'/>"></script>
-	<script type="text/javascript" src="<html:rewrite page='/includes/javascript/uploadImageLearning.js'/>"></script>
+	<script type="text/javascript" src="<lams:WebAppURL/>includes/javascript/imageGalleryitem.js"></script>
+	<script type="text/javascript" src="<lams:WebAppURL/>includes/javascript/uploadImageLearning.js"></script>
     <script type="text/javascript" src="${lams}includes/javascript/upload.js"></script>
  	<script type="text/javascript" src="${lams}includes/javascript/jquery.form.js"></script>
- 	<script type="text/javascript" src="<html:rewrite page='/includes/javascript/fotorama.js'/>"></script>
+ 	<script type="text/javascript" src="<lams:WebAppURL/>includes/javascript/fotorama.js"></script>
 	<script type="text/javascript">
 	
 		$(document).ready(function(){ 
@@ -86,9 +86,9 @@
 							</c:if>					
 						
 							{
-								img: '<html:rewrite page="/download/?uuid="/>${image.mediumFileUuid}&preferDownload=false',
-								//thumb: '<html:rewrite page="/download/?uuid="/>${image.thumbnailFileUuid}&preferDownload=false',
-								full: '<html:rewrite page="/download/?uuid="/>${image.originalFileUuid}&preferDownload=false',
+								img: "<lams:WebAppURL />download/?uuid="+${image.mediumFileUuid}+"&preferDownload="+false,
+								//thumb: ""<lams:WebAppURL />download/?uuid="+${image.thumbnailFileUuid}+"&preferDownload="+false,
+								full: "<lams:WebAppURL />download/?uuid="+${image.originalFileUuid}+"&preferDownload="+false,
 								id: '${image.uid}', // Custom anchor is used with the hash:true option.
 								caption: '<div class="caption-heading">${image.titleEscaped}</div>'
 									+ '${description}'
@@ -237,9 +237,9 @@
 					</div>
 
 					<c:if test="${mode != 'teacher'}">
-						<html:button property="FinishButton" onclick="return continueReflect()" styleClass="btn btn-default pull-left">
+						<button name="FinishButton" onclick="return continueReflect()" class="btn btn-default pull-left">
 							<fmt:message key="label.edit" />
-						</html:button>
+						</button>
 					</c:if>
 				</div>
 			</div>
@@ -253,12 +253,12 @@
 			>
 				<c:choose>
 					<c:when	test="${sessionMap.reflectOn && (not sessionMap.userFinished)}">
-						<html:button property="FinishButton" onclick="return continueReflect()" styleClass="btn btn-primary pull-right" >
+						<button name="FinishButton" onclick="return continueReflect()" class="btn btn-primary pull-right" >
 							<fmt:message key="label.continue" />
-						</html:button>
+						</button>
 					</c:when>
 					<c:otherwise>
-						<html:link href="#nogo" property="FinishButton" styleId="finishButton"	onclick="return finishSession()" styleClass="btn btn-primary pull-right" >
+						<a href="#nogo" name="FinishButton" id="finishButton"	onclick="return finishSession()" class="btn btn-primary pull-right" >
 							<span class="na">
 								<c:choose>
 				 					<c:when test="${sessionMap.activityPosition.last}">
@@ -269,7 +269,7 @@
 				 					</c:otherwise>
 				 				</c:choose>
 							</span>
-						</html:link>
+						</a>
 					</c:otherwise>
 				</c:choose>
 			</div>
Index: lams_tool_images/web/pages/learning/notebook.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r9e395fca5d7eb4a5ac4c9768642a336723a950f7
--- lams_tool_images/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_images/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
@@ -13,27 +13,27 @@
 			document.getElementById("finishButton").disabled = true;
 		}
 		function submitForm(methodName){
-			var f = document.getElementById('messageForm');
+			var f = document.getElementById('reflectionForm');
 			f.submit();
 		}
 	</script>
 </lams:head>
 <body class="stripes">
-	<lams:Page type="learner" title="${sessionMap.title}">
+	<lams:Page type="learner" title="${sessionMap.title}" formID="reflectionForm">
 		
-		<html:form action="/learning/submitReflection" method="post" onsubmit="disableFinishButton();" styleId="messageForm">
-			<html:hidden property="userID" />
-			<html:hidden property="sessionMapID" />
+		<form:form action="submitReflection.do" method="post" onsubmit="disableFinishButton();" modelAttribute="reflectionForm" id="reflectionForm">
+			<form:hidden path="userID" />
+			<form:hidden path="sessionMapID" />
 
 			<%@ include file="/common/messages.jsp"%>
 
 			<p>
 				<lams:out value="${sessionMap.reflectInstructions}" escapeHtml="true" />
 			</p>
 
-			<html:textarea styleId="focused" rows="5" property="entryText" styleClass="form-control" />
+			<textarea id="focused" rows="5" name="entryText" class="form-control"></textarea>
 
-			<html:link href="#nogo" styleClass="btn btn-primary voffset5 pull-right" styleId="finishButton" onclick="submitForm('finish')">
+			<a href="#nogo" class="btn btn-primary voffset5 pull-right" id="finishButton" onclick="submitForm('finish')">
 				<div class="na"> 
 					<c:choose>
 						<c:when test="${sessionMap.activityPosition.last}">
@@ -44,9 +44,9 @@
 						</c:otherwise>
 					</c:choose>
 				</div>
-			</html:link>
+			</a>
 				
-		</html:form>
+		</form:form>
 	
 		<div id="footer">
 		</div>
Index: lams_tool_images/web/pages/learning/parts/commentsarea.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r9e395fca5d7eb4a5ac4c9768642a336723a950f7
--- lams_tool_images/web/pages/learning/parts/commentsarea.jsp	(.../commentsarea.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_images/web/pages/learning/parts/commentsarea.jsp	(.../commentsarea.jsp)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
@@ -33,7 +33,7 @@
 	</script>
 	<script type="text/javascript" src="${lams}includes/javascript/rating.js"></script>
 </c:if>
-<script type="text/javascript" src="<html:rewrite page='/includes/javascript/uploadImageLearning.js'/>"></script>
+<script type="text/javascript" src="<lams:WebAppURL/>includes/javascript/uploadImageLearning.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/jquery.jRating.js"></script>
 <script type="text/javascript">
 	$(document).ready(function(){
@@ -74,7 +74,7 @@
 			<%--Voting area--------------%>
 		
 			<c:if test="${imageGallery.allowVote && isImageSelected}">
-				<html:form action="learning/vote" method="post" styleId="voting-form">
+				<form:form action="vote.do" method="post" modelAttribute="imageRatingForm" id="voting-form">
 					<input type="hidden" name="sessionMapID" value="${sessionMapID}"/>
 					<input type="hidden" name="imageUid" value="${sessionMap.currentImage.uid}"/>
 								
@@ -94,7 +94,7 @@
 							</c:choose>
 						</label>
 					</p>
-				</html:form>							
+				</form:form>							
 			</c:if>
 			
 			<%--"Check for new", "Add new image" and "Delete" buttons---------------%>
@@ -106,7 +106,7 @@
 					</button>
 								
 					<c:if test="${not finishedLock}">
-						<button onclick="javascript:newImageInit('<html:rewrite page='/authoring/newImageInit.do'/>?sessionMapID=${sessionMapID}&saveUsingLearningAction=true');"
+						<button onclick="javascript:newImageInit('<lams:WebAppURL />authoring/newImageInit.do?sessionMapID=${sessionMapID}&saveUsingLearningAction=true');"
 								class="btn btn-default btn-sm" id="add-new-image-button">  
 							<i class="fa fa-upload"></i> <fmt:message key="label.learning.add.new.image" />
 						</button>
Index: lams_tool_images/web/pages/monitoring/editactivity.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r9e395fca5d7eb4a5ac4c9768642a336723a950f7
--- lams_tool_images/web/pages/monitoring/editactivity.jsp	(.../editactivity.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_images/web/pages/monitoring/editactivity.jsp	(.../editactivity.jsp)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
@@ -29,13 +29,13 @@
 
 	<tr>
 		<td colspan="2">
-			<c:url  var="authoringUrl" value="/definelater.do">
+			<c:url  var="authoringUrl" value="/authoring/definelater.do">
 				<c:param name="toolContentID" value="${sessionMap.toolContentID}" />
 				<c:param name="contentFolderID" value="${sessionMap.contentFolderID}" />
 			</c:url>
-			<html:link href="#nogo" onclick="javascript:launchPopup('${authoringUrl}','definelater');" styleClass="btn btn-default pull-right">
+			<a href="#nogo" onclick="javascript:launchPopup('${authoringUrl}','definelater');" class="btn btn-default pull-right">
 				<fmt:message key="label.monitoring.edit.activity.edit" />
-			</html:link>
+			</a>
 		</td>
 	</tr>
 </table>
Index: lams_tool_images/web/pages/monitoring/imagesummary.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r9e395fca5d7eb4a5ac4c9768642a336723a950f7
--- lams_tool_images/web/pages/monitoring/imagesummary.jsp	(.../imagesummary.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_images/web/pages/monitoring/imagesummary.jsp	(.../imagesummary.jsp)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
@@ -46,13 +46,12 @@
 			
 		<div class="panel-body">
 
-			<html:form action="/monitoring/updateImage" method="post" styleId="imageGalleryItemForm">
-				<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-				<html:hidden property="imageUid" />		
-				<html:hidden property="sessionMapID" value="${sessionMapID}"/>
+			<form:form action="updateImage.do" method="post" modelAttribute="imageGalleryItemForm" id="imageGalleryItemForm">
+				<form:hidden path="imageUid" />		
+				<form:hidden path="sessionMapID" value="${sessionMapID}"/>
 				
 				<c:set var="mediumImagePath">
-			   		<html:rewrite page='/download/?uuid='/>${image.mediumFileUuid}&preferDownload=false
+			   		<lams:WebAppURL />download/?uuid=${image.mediumFileUuid}&preferDownload=false
 				</c:set>	
 				<c:set var="title">
 					<c:out value="${image.title}" escapeXml="true"/>
@@ -63,18 +62,18 @@
 				    <label for="file-title">
 				    	<fmt:message key="label.authoring.basic.resource.title.input"/>
 				    </label>
-				    <html:text property="title" styleClass="form-control" styleId="file-title" tabindex="1"/>
+				    <input type="text" name="title" value="${imageGalleryItemForm.title}" class="form-control" id="file-title" tabindex="1"/>
 				</div>
 				
 				<div class="form-group">
 					<label for="description">
 						<fmt:message key="label.authoring.basic.resource.description.input" />
 					</label>
 		            	
-					<lams:CKEditor id="description" value="${formBean.description}" width="99%" 
+					<lams:CKEditor id="description" value="${imageGalleryItemForm.description}" width="99%" 
 						contentFolderID="${sessionMap.imageGalleryForm.contentFolderID}" />
 				</div>
-			</html:form>			
+			</form:form>			
 			<br>
 			
 			<c:if test="${imageGallery.allowRank}">
@@ -137,7 +136,7 @@
 				<a href="#nogo" onclick="javascript:self.parent.tb_remove();" class="btn btn-default roffset5">
 					<fmt:message key="label.cancel" /> 
 				</a>
-				<a href="#nogo" onclick="javascript:document.imageGalleryItemForm.submit();" class="btn btn-default">
+				<a href="#nogo" onclick="javascript:document.forms.imageGalleryItemForm.submit();" class="btn btn-default">
 					<fmt:message key="label.monitoring.imagesummary.save" /> 
 				</a>
 			</div>
Index: lams_tool_images/web/pages/monitoring/monitoring.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r9e395fca5d7eb4a5ac4c9768642a336723a950f7
--- lams_tool_images/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_images/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
@@ -63,8 +63,8 @@
 			var LABEL_MAX_FILE_SIZE = '<fmt:message key="errors.maxfilesize"><param>{0}</param></fmt:message>';
 			var LABEL_NOT_ALLOWED_FORMAT = '<fmt:message key="error.resource.image.not.alowed.format"/>';
 		</script>
-		<script type="text/javascript" src="<html:rewrite page='/includes/javascript/imageGalleryitem.js'/>"></script>
-		<script type="text/javascript" src="<html:rewrite page='/includes/javascript/uploadImageLearning.js'/>"></script>
+		<script type="text/javascript" src="<lams:WebAppURL />includes/javascript/imageGalleryitem.js"></script>
+		<script type="text/javascript" src="<lams:WebAppURL />includes/javascript/uploadImageLearning.js"></script>
     	<script type="text/javascript" src="${lams}includes/javascript/upload.js"></script>
  		<script type="text/javascript" src="${lams}includes/javascript/thickbox.js"></script>
 		<script type="text/javascript" src="${lams}includes/javascript/monitorToolSummaryAdvanced.js" ></script>
Index: lams_tool_images/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r9e395fca5d7eb4a5ac4c9768642a336723a950f7
--- lams_tool_images/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_images/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
@@ -99,7 +99,7 @@
 
 					<td align="center">
 						<c:set var="thumbnailPath">
-						   	<html:rewrite page='/download/?uuid='/>${image.thumbnailFileUuid}&preferDownload=false
+						   	<lams:WebAppURL />download/?uuid=${image.thumbnailFileUuid}&preferDownload=false
 						</c:set>
 						<c:set var="url" >
 							<c:url value='/monitoring/imageSummary.do'/>?sessionMapID=${sessionMapID}&imageUid=${image.uid}&toolSessionID=${sessionId}&KeepThis=true&TB_iframe=true&modal=true
@@ -218,9 +218,9 @@
 						<c:set var="viewReflection">
 							<c:url value="/monitoring/viewReflection.do?toolSessionID=${sessionId}&userUid=${user.userUid}"/>
 						</c:set>
-						<html:link href="javascript:launchPopup('${viewReflection}')" styleClass="btn btn-default btn-xs loffset5">
+						<a href="javascript:launchPopup('${viewReflection}')" class="btn btn-default btn-xs loffset5">
 							<fmt:message key="label.view" />
-						</html:link>
+						</a>
 					</td>
 				</tr>
 			</c:forEach>
@@ -244,7 +244,7 @@
 <div id="manage-image-buttons">
 	<div class="panel panel-default" >
 		<div class="panel-heading">
-			<button onclick="javascript:newImageInit('<html:rewrite page='/authoring/newImageInit.do'/>?sessionMapID=${sessionMapID}&saveUsingLearningAction=true');"
+			<button onclick="javascript:newImageInit('<c:url value="/authoring/newImageInit.do?sessionMapID=${sessionMapID}&saveUsingLearningAction=true"/>');"
 					class="btn btn-default btn-xs loffset5  " id="">  
 				<i class="fa fa-upload"></i> <fmt:message key="label.learning.add.new.image" />
 			</button>
Index: lams_tool_lamc/web/authoring/AuthoringTabsHolder.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r9e395fca5d7eb4a5ac4c9768642a336723a950f7
--- lams_tool_lamc/web/authoring/AuthoringTabsHolder.jsp	(.../AuthoringTabsHolder.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_lamc/web/authoring/AuthoringTabsHolder.jsp	(.../AuthoringTabsHolder.jsp)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
@@ -20,10 +20,12 @@
 			});		
 		});
 
-		function submitMethod(actionMethod) {
-			document.McAuthoringForm.dispatch.value=actionMethod; 
-			document.McAuthoringForm.submit();
+		function submitMethod(methodName) {
+			var f = document.getElementById('mcAuthoringForm');
+			f.action = methodName + ".do";
+			f.submit();
 		}
+
 		
 		function submitModifyAuthoringQuestion(questionIndexValue, actionMethod) {
 			document.McAuthoringForm.questionIndex.value=questionIndexValue; 
@@ -74,12 +76,11 @@
 </lams:head>
 <body onLoad="init();" class="stripes">
 
-	<html:form  action="/authoring?validate=false" styleId="authoringForm" enctype="multipart/form-data" method="POST" target="_self">
-		<html:hidden property="dispatch" value="submitAllContent"/>
-		<html:hidden property="httpSessionID" value="${sessionMapId}"/>
+	<form:form  action="submitAllContent.do" modelAttribute="mcAuthoringForm" id="mcAuthoringForm" enctype="multipart/form-data" method="POST" target="_self">
+		<form:hidden path="httpSessionID" value="${sessionMapId}"/>
 			
 		<c:set var="title"><fmt:message key="activity.title" /></c:set>
-		<lams:Page title="${title}" type="navbar">
+		<lams:Page title="${title}" type="navbar" formID="mcAuthoringForm">
 
 			<lams:Tabs control="true" title="${title}" helpToolSignature="<%= McAppConstants.TOOL_SIGNATURE %>" helpModule="authoring">
 				<lams:Tab id="1" key="label.basic" />
@@ -95,14 +96,14 @@
  					<lams:TabBody id="2" titleKey="label.advanced" page="AdvancedContent.jsp" />
                 </lams:TabBodys>
 
-				<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" toolSignature="lamc11" 
+				<lams:AuthoringButton formID="mcAuthoringForm" clearSessionActionUrl="/clearsession.do" toolSignature="lamc11" 
 					cancelButtonLabelKey="label.cancel" saveButtonLabelKey="label.save" toolContentID="${sessionMap.toolContentID}" 
 					contentFolderID="${sessionMap.contentFolderID}" accessMode="${sessionMap.mode}" defineLater="${sessionMap.mode=='teacher'}"/>
 			</lams:TabBodyArea>
 					
 			<div id="footer"></div>
 		</lams:Page>
-	</html:form>
+	</form:form>
 	
 </body>
 </lams:html>
\ No newline at end of file