Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/controller/AuthoringController.java
===================================================================
diff -u -r9c66807dec11ccfe2299008ded08091f487a3478 -r17eedca34ff3aaaee38fc4dc4a93301351379c60
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision 9c66807dec11ccfe2299008ded08091f487a3478)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision 17eedca34ff3aaaee38fc4dc4a93301351379c60)
@@ -176,7 +176,7 @@
      * Display same entire authoring page content from HttpSession variable.
      */
     @RequestMapping(path = "/init", method = RequestMethod.POST)
-    public String initPage(@ModelAttribute("imageGalleryForm") ImageGalleryForm startForm, HttpServletRequest request)
+    public String initPage(@ModelAttribute ImageGalleryForm startForm, HttpServletRequest request)
 	    throws ServletException {
 
 	String sessionMapID = WebUtil.readStrParam(request, ImageGalleryConstants.ATTR_SESSION_MAP_ID);
@@ -193,16 +193,15 @@
 	ToolAccessMode mode = WebUtil.readToolAccessModeAuthorDefaulted(request);
 	request.setAttribute(AttributeNames.ATTR_MODE, mode.toString());
 	request.setAttribute("imageGalleryForm", startForm);
-
 	return "pages/authoring/authoring";
     }
 
     /**
      * This method will persist all inforamtion in this authoring page, include all imageGallery item, information etc.
      */
-    @RequestMapping("/update")
-    public String updateContent(@ModelAttribute ImageGalleryForm imageGalleryForm, HttpServletRequest request)
-	    throws IllegalAccessException, InvocationTargetException, Exception {
+    @RequestMapping(path = "/update", method = RequestMethod.POST)
+    public String updateContent(@ModelAttribute ImageGalleryForm imageGalleryForm,
+	    HttpServletRequest request) throws IllegalAccessException, InvocationTargetException, Exception {
 
 	// get back sessionMAP
 	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
@@ -373,14 +372,14 @@
      * persisted.
      */
     @RequestMapping("/saveOrUpdateImage")
-    public String saveOrUpdateImage(@ModelAttribute ImageGalleryItemForm itemForm, HttpServletRequest request,
+    public String saveOrUpdateImage(@ModelAttribute ImageGalleryItemForm imageGalleryItemForm, HttpServletRequest request,
 	    HttpServletResponse response) {
 
-	MultiValueMap<String, String> errorMap = ImageGalleryUtils.validateImageGalleryItem(itemForm, true);
+	MultiValueMap<String, String> errorMap = ImageGalleryUtils.validateImageGalleryItem(imageGalleryItemForm, true);
 
 	try {
 	    if (errorMap.isEmpty()) {
-		extractFormToImageGalleryItem(request, itemForm);
+		extractFormToImageGalleryItem(request, imageGalleryItemForm);
 	    }
 	} catch (Exception e) {
 	    // any upload exception will display as normal error message rather then throw exception directly
@@ -394,7 +393,7 @@
 	}
 
 	// set session map ID so that itemlist.jsp can get sessionMAP
-	request.setAttribute(ImageGalleryConstants.ATTR_SESSION_MAP_ID, itemForm.getSessionMapID());
+	request.setAttribute(ImageGalleryConstants.ATTR_SESSION_MAP_ID, imageGalleryItemForm.getSessionMapID());
 	// return null to close this window
 	return "pages/authoring/parts/itemlist";
     }
@@ -467,14 +466,14 @@
      * persisted.
      */
     @RequestMapping("/saveMultipleImages")
-    public String saveMultipleImages(@ModelAttribute MultipleImagesForm multipleForm, HttpServletRequest request,
+    public String saveMultipleImages(@ModelAttribute MultipleImagesForm multipleImagesForm, HttpServletRequest request,
 	    HttpServletResponse response) {
 
-	MultiValueMap<String, String> errorMap = ImageGalleryUtils.validateMultipleImages(multipleForm, true);
+	MultiValueMap<String, String> errorMap = ImageGalleryUtils.validateMultipleImages(multipleImagesForm, true);
 
 	try {
 	    if (errorMap.isEmpty()) {
-		extractMultipleFormToImageGalleryItems(request, multipleForm);
+		extractMultipleFormToImageGalleryItems(request, multipleImagesForm);
 	    }
 	} catch (Exception e) {
 	    // any upload exception will display as normal error message rather then throw exception directly
@@ -487,7 +486,7 @@
 	}
 
 	// set session map ID so that itemlist.jsp can get sessionMAP
-	request.setAttribute(ImageGalleryConstants.ATTR_SESSION_MAP_ID, multipleForm.getSessionMapID());
+	request.setAttribute(ImageGalleryConstants.ATTR_SESSION_MAP_ID, multipleImagesForm.getSessionMapID());
 	// return null to close this window
 	return "pages/authoring/parts/itemlist";
     }
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/controller/LearningController.java
===================================================================
diff -u -r9c66807dec11ccfe2299008ded08091f487a3478 -r17eedca34ff3aaaee38fc4dc4a93301351379c60
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/controller/LearningController.java	(.../LearningController.java)	(revision 9c66807dec11ccfe2299008ded08091f487a3478)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/controller/LearningController.java	(.../LearningController.java)	(revision 17eedca34ff3aaaee38fc4dc4a93301351379c60)
@@ -259,21 +259,21 @@
      * Save file or url imageGallery item into database.
      */
     @RequestMapping("/saveNewImage")
-    public String saveNewImage(@ModelAttribute ImageGalleryItemForm itemForm, HttpServletRequest request,
+    public String saveNewImage(@ModelAttribute ImageGalleryItemForm imageGalleryItemForm, HttpServletRequest request,
 	    HttpServletResponse response) throws IOException {
 
 	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
-		.getAttribute(itemForm.getSessionMapID());
+		.getAttribute(imageGalleryItemForm.getSessionMapID());
 	ToolAccessMode mode = (ToolAccessMode) sessionMap.get(AttributeNames.ATTR_MODE);
 
 	//validate form
 	boolean isLargeFilesAllowed = mode.isTeacher();
-	MultiValueMap<String, String> errorMap = ImageGalleryUtils.validateImageGalleryItem(itemForm,
+	MultiValueMap<String, String> errorMap = ImageGalleryUtils.validateImageGalleryItem(imageGalleryItemForm,
 		isLargeFilesAllowed);
 
 	try {
 	    if (errorMap.isEmpty()) {
-		extractFormToImageGalleryItem(request, itemForm);
+		extractFormToImageGalleryItem(request, imageGalleryItemForm);
 	    }
 	} catch (Exception e) {
 	    // any upload exception will display as normal error message rather then throw exception directly
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/form/AdminForm.java
===================================================================
diff -u -r3399163940c61c9132223c758d274486e57ff9b7 -r17eedca34ff3aaaee38fc4dc4a93301351379c60
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/form/AdminForm.java	(.../AdminForm.java)	(revision 3399163940c61c9132223c758d274486e57ff9b7)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/form/AdminForm.java	(.../AdminForm.java)	(revision 17eedca34ff3aaaee38fc4dc4a93301351379c60)
@@ -20,32 +20,41 @@
  * ****************************************************************
  */
 
-
 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(ActionMapping arg0, HttpServletRequest arg1) {
+
+	MultiValueMap<String, String> errorMap = new LinkedMultiValueMap<String, String>();
+	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 -r3399163940c61c9132223c758d274486e57ff9b7 -r17eedca34ff3aaaee38fc4dc4a93301351379c60
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/form/ImageGalleryForm.java	(.../ImageGalleryForm.java)	(revision 3399163940c61c9132223c758d274486e57ff9b7)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/form/ImageGalleryForm.java	(.../ImageGalleryForm.java)	(revision 17eedca34ff3aaaee38fc4dc4a93301351379c60)
@@ -31,6 +31,7 @@
 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 +41,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 +50,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 +70,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 +91,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 -r9c66807dec11ccfe2299008ded08091f487a3478 -r17eedca34ff3aaaee38fc4dc4a93301351379c60
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/form/ImageGalleryItemForm.java	(.../ImageGalleryItemForm.java)	(revision 9c66807dec11ccfe2299008ded08091f487a3478)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/form/ImageGalleryItemForm.java	(.../ImageGalleryItemForm.java)	(revision 17eedca34ff3aaaee38fc4dc4a93301351379c60)
@@ -23,8 +23,6 @@
 
 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;
 
 /**
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/form/ImageRatingForm.java
===================================================================
diff -u -r3399163940c61c9132223c758d274486e57ff9b7 -r17eedca34ff3aaaee38fc4dc4a93301351379c60
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/form/ImageRatingForm.java	(.../ImageRatingForm.java)	(revision 3399163940c61c9132223c758d274486e57ff9b7)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/form/ImageRatingForm.java	(.../ImageRatingForm.java)	(revision 17eedca34ff3aaaee38fc4dc4a93301351379c60)
@@ -31,7 +31,7 @@
  *
  * @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 -r9c66807dec11ccfe2299008ded08091f487a3478 -r17eedca34ff3aaaee38fc4dc4a93301351379c60
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/form/MultipleImagesForm.java	(.../MultipleImagesForm.java)	(revision 9c66807dec11ccfe2299008ded08091f487a3478)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/form/MultipleImagesForm.java	(.../MultipleImagesForm.java)	(revision 17eedca34ff3aaaee38fc4dc4a93301351379c60)
@@ -20,11 +20,8 @@
  * ****************************************************************
  */
 
-
 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;
 
 /**
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/form/ReflectionForm.java
===================================================================
diff -u -r3399163940c61c9132223c758d274486e57ff9b7 -r17eedca34ff3aaaee38fc4dc4a93301351379c60
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/form/ReflectionForm.java	(.../ReflectionForm.java)	(revision 3399163940c61c9132223c758d274486e57ff9b7)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/form/ReflectionForm.java	(.../ReflectionForm.java)	(revision 17eedca34ff3aaaee38fc4dc4a93301351379c60)
@@ -34,7 +34,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/AuthoringRatingCriteria.tag
===================================================================
diff -u -r9c66807dec11ccfe2299008ded08091f487a3478 -r17eedca34ff3aaaee38fc4dc4a93301351379c60
--- lams_tool_images/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 9c66807dec11ccfe2299008ded08091f487a3478)
+++ lams_tool_images/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 17eedca34ff3aaaee38fc4dc4a93301351379c60)
@@ -285,39 +285,35 @@
 					</label>
 					<form:select path="${formContentPrefix}minimumRates" id="minimum-rates" 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">2</form:option>
-						<form:option value="3">3</form:option>
-						<form:option value="4">4</form:option>
-						<form:option value="5">5</form:option>
-						<form:option value="6">6</form:option>
-						<form:option value="7">7</form:option>
-						<form:option value="8">8</form:option>
-						<form:option value="9">9</form:option>
-						<form:option value="10">10</form:option>
+						<form:option value="0" label="<fmt:message key="${noMinimumLabel}" />"/>
+						<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>
 				
 					<label for="maximum-rates">
 						<fmt:message key="${maximumLabel}" />
 					</label>
 					<form:select path="${formContentPrefix}maximumRates" id="maximum-rates" onmouseup="validateRatingLimits(false);" 
 							cssClass="form-control form-control-inline">
-						<form:option value="0">
-							<fmt:message key="${noMaximumLabel}" />
-						</form:option>
-						<form:option value="1">1</form:option>
-						<form:option value="2">2</form:option>
-						<form:option value="3">3</form:option>
-						<form:option value="4">4</form:option>
-						<form:option value="5">5</form:option>
-						<form:option value="6">6</form:option>
-						<form:option value="7">7</form:option>
-						<form:option value="8">8</form:option>
-						<form:option value="9">9</form:option>
-						<form:option value="10">10</form:option>
+						<form:option value="0" label="<fmt:message key="${noMaximumLabel}"/>
+						<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/common/header.jsp
===================================================================
diff -u -r9c66807dec11ccfe2299008ded08091f487a3478 -r17eedca34ff3aaaee38fc4dc4a93301351379c60
--- lams_tool_images/web/common/header.jsp	(.../header.jsp)	(revision 9c66807dec11ccfe2299008ded08091f487a3478)
+++ lams_tool_images/web/common/header.jsp	(.../header.jsp)	(revision 17eedca34ff3aaaee38fc4dc4a93301351379c60)
@@ -8,7 +8,7 @@
 
  <!-- ********************  javascript ********************** -->
 <script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
-<script type="text/javascript" src="${lams}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/tabbedheader.jsp
===================================================================
diff -u -r9c66807dec11ccfe2299008ded08091f487a3478 -r17eedca34ff3aaaee38fc4dc4a93301351379c60
--- lams_tool_images/web/common/tabbedheader.jsp	(.../tabbedheader.jsp)	(revision 9c66807dec11ccfe2299008ded08091f487a3478)
+++ lams_tool_images/web/common/tabbedheader.jsp	(.../tabbedheader.jsp)	(revision 17eedca34ff3aaaee38fc4dc4a93301351379c60)
@@ -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="${lams}/includes/javascript/imageGallerycommon.js'/>"></script>
+<script type="text/javascript" src="<lams:WebAppURL/>includes/javascript/imageGallerycommon.js"></script>
Index: lams_tool_images/web/pages/authoring/advance.jsp
===================================================================
diff -u -r9c66807dec11ccfe2299008ded08091f487a3478 -r17eedca34ff3aaaee38fc4dc4a93301351379c60
--- lams_tool_images/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision 9c66807dec11ccfe2299008ded08091f487a3478)
+++ lams_tool_images/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision 17eedca34ff3aaaee38fc4dc4a93301351379c60)
@@ -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,24 +15,24 @@
 	 * 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="sessionMap"	value="${sessionScope[authoringForm.sessionMapID]}" />
+<c:set var="sessionMap"	value="${sessionScope[imageGalleryForm.sessionMapID]}" />
 
 <!-- Advance Tab Content -->
 
@@ -83,12 +84,12 @@
 		</label>
 	</div>
 		
-	<c:if test='${!imageGalleryForm.imageGallery.allowRank}'><c:set var="styleId">display:none;</c:set></c:if>
+	<c:if test='${!imageGalleryForm.imageGallery.allowRank}'><c:set var="id">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"
 		formContentPrefix="imageGallery"
-	    id="${styleId}"/>
+	    id="${id}"/>
 	
 </div>
 
Index: lams_tool_images/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r9c66807dec11ccfe2299008ded08091f487a3478 -r17eedca34ff3aaaee38fc4dc4a93301351379c60
--- lams_tool_images/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 9c66807dec11ccfe2299008ded08091f487a3478)
+++ lams_tool_images/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 17eedca34ff3aaaee38fc4dc4a93301351379c60)
@@ -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="${lams}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>
Index: lams_tool_images/web/pages/authoring/basic.jsp
===================================================================
diff -u -r9c66807dec11ccfe2299008ded08091f487a3478 -r17eedca34ff3aaaee38fc4dc4a93301351379c60
--- lams_tool_images/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 9c66807dec11ccfe2299008ded08091f487a3478)
+++ lams_tool_images/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 17eedca34ff3aaaee38fc4dc4a93301351379c60)
@@ -1,11 +1,11 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<link rel="stylesheet" href="${lams}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 = "${lams}includes/images/"; 
+	var pathToImageFolder = "<lams:WebAppURL/>includes/images/"; 
 </script>
-<script type="text/javascript" src="<lams:WebAppURL />includes/javascript/lytebox.js'/>" ></script>
+<script type="text/javascript" src="<lams:WebAppURL />includes/javascript/lytebox.js" ></script>
 <script lang="javascript">
 
 	function hideMessage(){
Index: lams_tool_images/web/pages/authoring/parts/addimage.jsp
===================================================================
diff -u -r9c66807dec11ccfe2299008ded08091f487a3478 -r17eedca34ff3aaaee38fc4dc4a93301351379c60
--- lams_tool_images/web/pages/authoring/parts/addimage.jsp	(.../addimage.jsp)	(revision 9c66807dec11ccfe2299008ded08091f487a3478)
+++ lams_tool_images/web/pages/authoring/parts/addimage.jsp	(.../addimage.jsp)	(revision 17eedca34ff3aaaee38fc4dc4a93301351379c60)
@@ -4,12 +4,12 @@
 		<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>
 
-<form:form action="saveOrUpdateImage.do" method="post" modelAttribute="imageGalleryItemForm" id="imageGalleryItemForm" enctype="multipart/form-data">
-	<c:set var="sessionMap"	value="${sessionScope[imageGalleryItemForm.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">
@@ -28,8 +28,8 @@
 			
 		<div class="panel-body">
 			<%@ include file="/common/messages.jsp"%>
-			<form:hidden property="sessionMapID" />
-			<form:hidden property="imageIndex" />
+			<form:hidden path="sessionMapID" />
+			<form:hidden path="imageIndex" />
 	
 			<div class="form-group">
 			    <label for="file-title">
@@ -56,7 +56,7 @@
 			</div>
 				
 			<div class="form-group">
-				<c:set var="itemAttachment" value="imageGalleryItemForm" />
+				<c:set var="itemAttachment" value="${imageGalleryItemForm}"/>
 				<div id="itemAttachmentArea">
 					<%@ include file="/pages/authoring/parts/imagefile.jsp"%>
 				</div>
Index: lams_tool_images/web/pages/authoring/parts/addmultipleimages.jsp
===================================================================
diff -u -r9c66807dec11ccfe2299008ded08091f487a3478 -r17eedca34ff3aaaee38fc4dc4a93301351379c60
--- lams_tool_images/web/pages/authoring/parts/addmultipleimages.jsp	(.../addmultipleimages.jsp)	(revision 9c66807dec11ccfe2299008ded08091f487a3478)
+++ lams_tool_images/web/pages/authoring/parts/addmultipleimages.jsp	(.../addmultipleimages.jsp)	(revision 17eedca34ff3aaaee38fc4dc4a93301351379c60)
@@ -16,13 +16,13 @@
 	</c:otherwise>
 </c:choose>
 
-<form:form action="saveMultipleImages.do" method="post" modelAttribute="imageGalleryItemsForm" id="imageGalleryItemsForm" enctype="multipart/form-data">
+<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('<lams:WebAppURL />authoring/newImageInit.do?sessionMapID=${imageGalleryItemsForm.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>
@@ -32,7 +32,7 @@
 		<div class="panel-body">
 	
 			<%@ include file="/common/messages.jsp"%>	
-			<form:hidden parth="sessionMapID" id="sessionMapID"/>
+			<form:hidden path="sessionMapID" id="sessionMapID"/>
 	
 			<div class="form-group">
 				<label>
Index: lams_tool_images/web/pages/learning/parts/commentsarea.jsp
===================================================================
diff -u -r9c66807dec11ccfe2299008ded08091f487a3478 -r17eedca34ff3aaaee38fc4dc4a93301351379c60
--- lams_tool_images/web/pages/learning/parts/commentsarea.jsp	(.../commentsarea.jsp)	(revision 9c66807dec11ccfe2299008ded08091f487a3478)
+++ lams_tool_images/web/pages/learning/parts/commentsarea.jsp	(.../commentsarea.jsp)	(revision 17eedca34ff3aaaee38fc4dc4a93301351379c60)
@@ -106,7 +106,7 @@
 					</button>
 								
 					<c:if test="${not finishedLock}">
-						<button onclick="javascript:newImageInit('<lams:WebAppURL />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/imagesummary.jsp
===================================================================
diff -u -r9c66807dec11ccfe2299008ded08091f487a3478 -r17eedca34ff3aaaee38fc4dc4a93301351379c60
--- lams_tool_images/web/pages/monitoring/imagesummary.jsp	(.../imagesummary.jsp)	(revision 9c66807dec11ccfe2299008ded08091f487a3478)
+++ lams_tool_images/web/pages/monitoring/imagesummary.jsp	(.../imagesummary.jsp)	(revision 17eedca34ff3aaaee38fc4dc4a93301351379c60)
@@ -47,8 +47,8 @@
 		<div class="panel-body">
 
 			<form:form action="updateImage.do" method="post" modelAttribute="imageGalleryItemForm" id="imageGalleryItemForm">
-				<form:hidden property="imageUid" />		
-				<form:hidden property="sessionMapID" value="${sessionMapID}"/>
+				<form:hidden path="imageUid" />		
+				<form:hidden path="sessionMapID" value="${sessionMapID}"/>
 				
 				<c:set var="mediumImagePath">
 			   		<lams:WebAppURL />download/?uuid=${image.mediumFileUuid}&preferDownload=false