Index: lams_tool_forum/web/jsps/authoring/basic.jsp
===================================================================
diff -u -rcd8445f5cc34046fc3aad47db4e6f5f1c712ba4f -rf4d9fb8cc51c25fecdd0eac1dcf5f5efc916cdf8
--- lams_tool_forum/web/jsps/authoring/basic.jsp	(.../basic.jsp)	(revision cd8445f5cc34046fc3aad47db4e6f5f1c712ba4f)
+++ lams_tool_forum/web/jsps/authoring/basic.jsp	(.../basic.jsp)	(revision f4d9fb8cc51c25fecdd0eac1dcf5f5efc916cdf8)
@@ -145,9 +145,9 @@
 </div>
 
 <div class="form-inline">
-<a href="javascript:showMessage('<html:rewrite page="/authoring/newTopic.do?sessionMapID=${formBean.sessionMapID}"/>');" id="addTopic" 
-		class="btn btn-default btn-sm"><i class="fa fa-plus"></i>&nbsp;<fmt:message key="label.authoring.create.new.topic" /> 
-</a>
+	<a href="javascript:showMessage('<html:rewrite page="/authoring/newTopic.do?sessionMapID=${formBean.sessionMapID}"/>');" id="addTopic" 
+			class="btn btn-default btn-sm"><i class="fa fa-plus"></i>&nbsp;<fmt:message key="label.authoring.create.new.topic" /> 
+	</a>
 </div>
 
 <div id="messageArea" name="messageArea" class="voffset10"></div>
Index: lams_tool_images/web/includes/javascript/imageGallerycommon.js
===================================================================
diff -u -r148c7644de4f74c8017616384ab7e4a346b9731a -rf4d9fb8cc51c25fecdd0eac1dcf5f5efc916cdf8
--- lams_tool_images/web/includes/javascript/imageGallerycommon.js	(.../imageGallerycommon.js)	(revision 148c7644de4f74c8017616384ab7e4a346b9731a)
+++ lams_tool_images/web/includes/javascript/imageGallerycommon.js	(.../imageGallerycommon.js)	(revision f4d9fb8cc51c25fecdd0eac1dcf5f5efc916cdf8)
@@ -2,18 +2,10 @@
  * Launches the popup window for the instruction files
  */
 function showMessage(url) {
-	$.ajaxSetup({ cache: true });
-	$("#reourceInputArea").load(url, function() {
-		var area=document.getElementById("reourceInputArea");
-		if (area != null) {
-			area.style.width="100%";
-			area.style.height="100%";
-			area.style.display="block";
-		}
-		var elem = document.getElementById("saveCancelButtons");
-		if (elem != null) {
-			elem.style.display="none";
-		}
+	$.ajaxSetup({ cache: false });
+	$("#new-image-input-area").load(url, function() {
+		$(this).show();
+		$("#saveCancelButtons").hide();
 	});
 }
 	
Index: lams_tool_images/web/includes/javascript/imageGalleryitem.js
===================================================================
diff -u -r5f7cdba78b6fde3914f078d77c1131bf742c0111 -rf4d9fb8cc51c25fecdd0eac1dcf5f5efc916cdf8
--- lams_tool_images/web/includes/javascript/imageGalleryitem.js	(.../imageGalleryitem.js)	(revision 5f7cdba78b6fde3914f078d77c1131bf742c0111)
+++ lams_tool_images/web/includes/javascript/imageGalleryitem.js	(.../imageGalleryitem.js)	(revision f4d9fb8cc51c25fecdd0eac1dcf5f5efc916cdf8)
@@ -66,8 +66,6 @@
 		formData.append('file', file, file.name);
 		$('#uploadButtons').hide();
 		$('#itemAttachmentArea_Busy').show();
-		
-		
 	}
 
 	$.ajax({
@@ -77,7 +75,7 @@
         processData: false,
         contentType: false,
     	success: function(data) {
-    		$('#imageGalleryListArea').html(data);
+    		$('#new-image-input-area').html(data);
     	},
     	error: function(jqXHR, textStatus, errorMessage) {
         	alert(errorMessage);
@@ -151,7 +149,7 @@
         processData: false,
         contentType: false,
     	success: function(data) {
-    		$('#imageGalleryListArea').html(data);
+    		$('#new-image-input-area').html(data);
     	},
     	error: function(jqXHR, textStatus, errorMessage) {
         	alert(errorMessage);
Index: lams_tool_images/web/pages/authoring/basic.jsp
===================================================================
diff -u -r5f7cdba78b6fde3914f078d77c1131bf742c0111 -rf4d9fb8cc51c25fecdd0eac1dcf5f5efc916cdf8
--- lams_tool_images/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 5f7cdba78b6fde3914f078d77c1131bf742c0111)
+++ lams_tool_images/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision f4d9fb8cc51c25fecdd0eac1dcf5f5efc916cdf8)
@@ -8,19 +8,10 @@
 
 <c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 <script lang="javascript">
-<!-- Common Javascript functions for LAMS -->
 
 	function hideMessage(){
-		var area=document.getElementById("reourceInputArea");
-		if(area != null){
-			area.style.width="0px";
-			area.style.height="0px";
-			area.style.display="none";
-		}
-		var elem = document.getElementById("saveCancelButtons");
-		if (elem != null) {
-			elem.style.display="block";
-		}
+		$("#new-image-input-area").hide();
+		$("#saveCancelButtons").show();
 	}
 	
 	function editItem(idx,sessionMapID){
@@ -116,7 +107,5 @@
 <html:link href="#nogo" styleClass="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>
-<p>
-	<div onload="javascript:window.location.hash = '#reourceInputArea';" id="reourceInputArea" name="reourceInputArea" style="voffset10"> 
-	</div>
-</p>
+
+<div id="new-image-input-area" class="voffset10"></div>
Index: lams_tool_images/web/pages/authoring/parts/addimage.jsp
===================================================================
diff -u -re8638cf925c1df25b5024af7d5b9c1ae2a737d90 -rf4d9fb8cc51c25fecdd0eac1dcf5f5efc916cdf8
--- lams_tool_images/web/pages/authoring/parts/addimage.jsp	(.../addimage.jsp)	(revision e8638cf925c1df25b5024af7d5b9c1ae2a737d90)
+++ lams_tool_images/web/pages/authoring/parts/addimage.jsp	(.../addimage.jsp)	(revision f4d9fb8cc51c25fecdd0eac1dcf5f5efc916cdf8)
@@ -37,7 +37,7 @@
 	            	
 				<lams:CKEditor id="description" value="${formBean.description}" width="99%" 
 					contentFolderID="${sessionMap.imageGalleryForm.contentFolderID}" 
-					resizeParentFrameName="reourceInputArea" />
+					resizeParentFrameName="new-image-input-area" />
 			</div>
 				
 			<div class="form-group">
@@ -51,7 +51,6 @@
 				<i class="fa fa-refresh fa-spin fa-2x fa-fw text-primary"></i>
 			</div>
 		
-		
 			<div id="uploadButtons" class="voffset10 pull-right">
 			    <a href="#nogo" onclick="javascript:cancelImageGalleryItem()" class="btn btn-sm btn-default loffset5">
 					<fmt:message key="label.cancel" /> 
Index: lams_tool_images/web/pages/authoring/parts/itemlist.jsp
===================================================================
diff -u -raaf77d979eda13d8e6947b82857bbeda7c62be3f -rf4d9fb8cc51c25fecdd0eac1dcf5f5efc916cdf8
--- lams_tool_images/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision aaf77d979eda13d8e6947b82857bbeda7c62be3f)
+++ lams_tool_images/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision f4d9fb8cc51c25fecdd0eac1dcf5f5efc916cdf8)
@@ -1,8 +1,4 @@
 <%@ include file="/common/taglibs.jsp"%>
-<c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request" />
-<c:set var="tool">
-	<lams:WebAppURL />
-</c:set>
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 
 <div id="itemList" >
@@ -58,7 +54,7 @@
 							onclick="javascript:deleteItem(${status.index},'${sessionMapID}')"></i>
 					</td>
 				</tr>
-				
+
 			</c:forEach>
 		</table>
 		
@@ -67,8 +63,10 @@
 
 <%-- This script will works when a new resoruce item submit in order to refresh "ImageGallery List" panel. --%>
 <script lang="javascript">
-	hideMessage();
-	var obj = document.getElementById('imageGalleryListArea');
-	obj.innerHTML= document.getElementById("itemList").innerHTML;
-	initLytebox();
+	if ($("#new-image-input-area").is(':visible')) {
+		hideMessage();
+		var itemList = $("#itemList", "#new-image-input-area").html();
+		$("#imageGalleryListArea").html(itemList);
+		initLytebox();
+	}
 </script>
Index: lams_tool_survey/web/pages/authoring/basic.jsp
===================================================================
diff -u -rbc686e6e29ef15120746beee5b9e47392ce4b306 -rf4d9fb8cc51c25fecdd0eac1dcf5f5efc916cdf8
--- lams_tool_survey/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision bc686e6e29ef15120746beee5b9e47392ce4b306)
+++ lams_tool_survey/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision f4d9fb8cc51c25fecdd0eac1dcf5f5efc916cdf8)
@@ -85,4 +85,4 @@
 <a href="javascript:showMessage('<html:rewrite page="/authoring/newItemInit.do?itemType=3&contentFolderID=${formBean.contentFolderID}&sessionMapID=${formBean.sessionMapID}"/>');"
 	class="btn btn-default"> <i class="fa fa-plus"></i>&nbsp; <fmt:message key="label.authoring.basic.add.survey.open.question" /> </a>
 
-<div id="questionInputArea" name="questionInputArea" class="voffset10"></div>
+<div id="questionInputArea" class="voffset10"></div>
Index: lams_tool_survey/web/pages/authoring/parts/itemlist.jsp
===================================================================
diff -u -r230631757ce5657c02733128542f738928cc514e -rf4d9fb8cc51c25fecdd0eac1dcf5f5efc916cdf8
--- lams_tool_survey/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision 230631757ce5657c02733128542f738928cc514e)
+++ lams_tool_survey/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision f4d9fb8cc51c25fecdd0eac1dcf5f5efc916cdf8)
@@ -1,6 +1,5 @@
 <%@ include file="/common/taglibs.jsp"%>
-<c:set var="ctxPath" value="${pageContext.request.contextPath}"
-	scope="request" />
+<c:set var="ctxPath" value="${pageContext.request.contextPath}"	scope="request" />
 <div id="itemList">
 
 <div class="panel panel-default voffset5">
@@ -70,7 +69,9 @@
 
 <%-- This script will works when a new resource item submit in order to refresh "Survey List" panel. --%>
 <script lang="javascript">
-	hideMessage();
-	var obj = document.getElementById('surveyListArea');
-	obj.innerHTML= document.getElementById("itemList").innerHTML;
+	if ($("#questionInputArea").is(':visible')) {
+		hideMessage();
+		var itemList = $("#itemList", "#questionInputArea").html();
+		$("#surveyListArea").html(itemList);
+	}
 </script>
Index: lams_tool_task/web/pages/authoring/basic.jsp
===================================================================
diff -u -r865eba81abdcadae4325223c15a315d66501993b -rf4d9fb8cc51c25fecdd0eac1dcf5f5efc916cdf8
--- lams_tool_task/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 865eba81abdcadae4325223c15a315d66501993b)
+++ lams_tool_task/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision f4d9fb8cc51c25fecdd0eac1dcf5f5efc916cdf8)
@@ -75,7 +75,10 @@
 	function submitTask(){
 		refreshCKEditors();
 		var form = $('#taskListItemForm');
-		$('#taskListListArea').load(form.attr('action'), form.serialize());
+		$('#resourceInputArea').load(
+			form.attr('action'), 
+			form.serialize()
+		);
 	} 
 	
 </script>
@@ -86,8 +89,9 @@
     <html:text property="taskList.title" styleClass="form-control"></html:text>
 </div>
 <div class="form-group">
-    <label for="taskList"><fmt:message key="label.authoring.basic.description" /></label>
-    <lams:CKEditor id="taskList.instructions" value="${formBean.taskList.instructions}" contentFolderID="${formBean.contentFolderID}"></lams:CKEditor>
+    <label for="taskList.instructions"><fmt:message key="label.authoring.basic.description" /></label>
+    <lams:CKEditor id="taskList.instructions" value="${formBean.taskList.instructions}" contentFolderID="${formBean.contentFolderID}">
+    </lams:CKEditor>
 </div>
 
 <div id="taskListListArea">
@@ -96,7 +100,7 @@
 </div>
 
 <a href="javascript:showMessage('<html:rewrite page="/authoring/newItemInit.do?sessionMapID=${formBean.sessionMapID}"/>');" class="btn btn-default btn-sm">
-		<i class="fa fa-plus"></i>&nbsp;<fmt:message key="label.authoring.basic.add.task" /></a> 
+	<i class="fa fa-plus"></i>&nbsp;<fmt:message key="label.authoring.basic.add.task" />
+</a> 
 
-<div id="resourceInputArea" name="resourceInputArea" class="voffset10"></div>
-
+<div id="resourceInputArea" class="voffset10"></div>
Index: lams_tool_task/web/pages/authoring/parts/addtask.jsp
===================================================================
diff -u -rd3b7cb3d77c38e03f29fe5336d1fa8e1e55395f9 -rf4d9fb8cc51c25fecdd0eac1dcf5f5efc916cdf8
--- lams_tool_task/web/pages/authoring/parts/addtask.jsp	(.../addtask.jsp)	(revision d3b7cb3d77c38e03f29fe5336d1fa8e1e55395f9)
+++ lams_tool_task/web/pages/authoring/parts/addtask.jsp	(.../addtask.jsp)	(revision f4d9fb8cc51c25fecdd0eac1dcf5f5efc916cdf8)
@@ -2,30 +2,29 @@
 <%@ include file="/common/taglibs.jsp"%>
 
 <lams:html>
-	<lams:head>
-		<%@ include file="/common/header.jsp"%>
-		<lams:css />
+<lams:head>
+	<%@ include file="/common/header.jsp"%>
+	<lams:css />
 
-		<script type="text/javascript">
-		
-			function uncheckIsFilesRequired() {
-				document.getElementById("isFilesRequired").checked=false;
-			}
+	<script type="text/javascript">
+		function uncheckIsFilesRequired() {
+			document.getElementById("isFilesRequired").checked=false;
+		}
 			
-			function uncheckIsCommentsRequired() {
-				document.getElementById("isCommentsRequired").checked=false;
-			}
-		</script>
+		function uncheckIsCommentsRequired() {
+			document.getElementById("isCommentsRequired").checked=false;
+		}
+	</script>
 
-	</lams:head>
-	<body>
+</lams:head>
+<body>
 
-		<div class="panel panel-default add-file">
-			<div class="panel-heading panel-title">
-				<fmt:message key="label.authoring.basic.add.task" />
-			</div>
+	<div class="panel panel-default add-file">
+		<div class="panel-heading panel-title">
+			<fmt:message key="label.authoring.basic.add.task" />
+		</div>
 			
-			<div class="panel-body">
+		<div class="panel-body">
 
 			<%@ include file="/common/messages.jsp"%>
 
@@ -129,11 +128,15 @@
 	
 			</html:form>
 	
-			<a href="#" onclick="javascript:submitTask();" class="btn btn-default btn-sm pull-right"><i class="fa fa-plus"></i>&nbsp;<fmt:message key="button.add" /> </a>
-			<a href="#" onclick="javascript:hideMessage()" class="btn btn-default btn-sm pull-right roffset5"><fmt:message key="label.cancel" /> </a>
+			<a href="#" onclick="javascript:submitTask();" class="btn btn-default btn-sm pull-right">
+				<i class="fa fa-plus"></i>&nbsp;<fmt:message key="button.add" /> 
+			</a>
+			<a href="#" onclick="javascript:hideMessage()" class="btn btn-default btn-sm pull-right roffset5">
+				<fmt:message key="label.cancel" /> 
+			</a>
 			
-			</div>
 		</div>
+	</div>
 
-	</body>
+</body>
 </lams:html>
Index: lams_tool_task/web/pages/authoring/parts/itemlist.jsp
===================================================================
diff -u -rd6dcae53cbe27a85aedf62b8545ee3193ec55220 -rf4d9fb8cc51c25fecdd0eac1dcf5f5efc916cdf8
--- lams_tool_task/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision d6dcae53cbe27a85aedf62b8545ee3193ec55220)
+++ lams_tool_task/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision f4d9fb8cc51c25fecdd0eac1dcf5f5efc916cdf8)
@@ -1,11 +1,5 @@
 <%@ include file="/common/taglibs.jsp"%>
-<c:set var="ctxPath" value="${pageContext.request.contextPath}"
-	scope="request" />
 
-<c:set var="tool">
-	<lams:WebAppURL />
-</c:set>
-
 <div id="itemList">
 	<h4>
 		<fmt:message key="label.authoring.basic.task.list.title" />
@@ -15,8 +9,7 @@
 	<table class="table table-condensed table-striped" id="itemTable">
 		<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 
-		<c:forEach var="taskList" items="${sessionMap.taskListList}"
-			varStatus="status">
+		<c:forEach var="taskList" items="${sessionMap.taskListList}" varStatus="status">
 			<tr>
 				<td width="5%" class="field-name align-right">
 					<fmt:message key="label.authoring.basic.resource.task" />
@@ -52,7 +45,9 @@
 
 <%-- This script will works when a new item is submitted in order to refresh "TaskList List" panel. --%>
 <script lang="javascript">
-	hideMessage();
-	var obj = document.getElementById('taskListListArea');
-	obj.innerHTML= document.getElementById("itemList").innerHTML;
+	if ($("#resourceInputArea").is(':visible')) { 
+		hideMessage();
+		var tasks = $("#itemList", "#resourceInputArea").html();
+		$("#taskListListArea").html(itemList);
+	}
 </script>