Index: lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/web/actions/AuthoringAction.java
===================================================================
diff -u -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b -r6cfcb91c5526d4bbb22cd98dbd9d04c175cba1eb
--- lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
+++ lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 6cfcb91c5526d4bbb22cd98dbd9d04c175cba1eb)
@@ -135,9 +135,8 @@
 	// get bbb content.
 	Bbb bbb = bbbService.getBbbByContentId((Long) map.get(Constants.KEY_TOOL_CONTENT_ID));
 
-	// update bbb content using form inputs.
-	ToolAccessMode mode = (ToolAccessMode) map.get(Constants.KEY_MODE);
-	copyProperties(bbb, authForm, mode);
+	// update bbb content using form inputs
+	copyProperties(bbb, authForm);
 
 	// set the update date
 	bbb.setUpdateDate(new Date());
@@ -166,15 +165,12 @@
      * @param mode
      * @return
      */
-    private void copyProperties(Bbb bbb, AuthoringForm authForm, ToolAccessMode mode) {
+    private void copyProperties(Bbb bbb, AuthoringForm authForm) {
 	bbb.setTitle(authForm.getTitle());
 	bbb.setInstructions(authForm.getInstructions());
-	if (mode.isAuthor()) { // Teacher cannot modify following
-	    bbb.setReflectOnActivity(authForm.isReflectOnActivity());
-	    bbb.setReflectInstructions(authForm.getReflectInstructions());
-	    bbb.setLockOnFinished(authForm.isLockOnFinished());
-
-	}
+	bbb.setReflectOnActivity(authForm.isReflectOnActivity());
+	bbb.setReflectInstructions(authForm.getReflectInstructions());
+	bbb.setLockOnFinished(authForm.isLockOnFinished());
     }
 
     /**
Index: lams_tool_bbb/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r61afce49515660ee5d017b084bcd5a2308fb3bd7 -r6cfcb91c5526d4bbb22cd98dbd9d04c175cba1eb
--- lams_tool_bbb/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 61afce49515660ee5d017b084bcd5a2308fb3bd7)
+++ lams_tool_bbb/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 6cfcb91c5526d4bbb22cd98dbd9d04c175cba1eb)
@@ -6,21 +6,15 @@
 
 <html:form action="/authoring" styleId="authoringForm" method="post" enctype="multipart/form-data">
 
-	<c:set var="defineLater" value="no" />
-	<c:if test="${sessionMap.mode == 'teacher'}">
-		<c:set var="defineLater" value="yes" />
-	</c:if>
+	<c:set var="title">
+		<fmt:message key="activity.title" />
+	</c:set>
 
-		<c:set var="title">
-			<fmt:message key="activity.title" />
-		</c:set>
-
-		<!--  TITLE KEY PAGE GOES HERE -->
-		<lams:Tabs control="true" title="${title}" helpToolSignature="<%= Constants.TOOL_SIGNATURE %>" helpModule="authoring">
-			<lams:Tab id="1" key="button.basic" />
-			<lams:Tab id="2" key="button.advanced" />
-		</lams:Tabs>
-
+	<!--  TITLE KEY PAGE GOES HERE -->
+	<lams:Tabs control="true" title="${title}" helpToolSignature="<%= Constants.TOOL_SIGNATURE %>" helpModule="authoring">
+		<lams:Tab id="1" key="button.basic" />
+		<lams:Tab id="2" key="button.advanced" />
+	</lams:Tabs>
 	<!--closes header-->
 
 	<html:hidden property="currentTab" styleId="currentTab" />
@@ -37,7 +31,6 @@
 			</lams:Alert>
 		</logic:messagesPresent>
 
-
 		<%-- Page tabs --%>
 		<lams:TabBodys>
 			<lams:TabBody id="1" titleKey="button.basic" page="basic.jsp" />
@@ -46,11 +39,9 @@
 
 		<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" toolSignature="labbb10"
 			cancelButtonLabelKey="button.cancel" saveButtonLabelKey="button.save" toolContentID="${sessionMap.toolContentID}"
-			accessMode="${sessionMap.mode}" defineLater="${defineLater}" customiseSessionID="${sessionMap.sessionID}"
+			accessMode="${sessionMap.mode}" defineLater="${sessionMap.mode == 'teacher'}" customiseSessionID="${sessionMap.sessionID}"
 			contentFolderID="${sessionMap.contentFolderID}" />
 
-
-
 	</lams:TabBodyArea>
 	<div id="footer"></div>
 </html:form>
Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/AuthoringAction.java
===================================================================
diff -u -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b -r6cfcb91c5526d4bbb22cd98dbd9d04c175cba1eb
--- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
+++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 6cfcb91c5526d4bbb22cd98dbd9d04c175cba1eb)
@@ -53,13 +53,6 @@
 import org.lamsfoundation.lams.web.util.SessionMap;
 
 /**
- * @author
- * @version
- *
- *
- *
- *
- *
  */
 public class AuthoringAction extends LamsDispatchAction {
 
@@ -77,7 +70,6 @@
     /**
      * Default method when no dispatch parameter is specified. It is expected that the parameter
      * <code>toolContentID</code> will be passed in. This will be used to retrieve content for this tool.
-     *
      */
     @Override
     protected ActionForward unspecified(ActionMapping mapping, ActionForm form, HttpServletRequest request,
@@ -140,9 +132,8 @@
 	// get chat content.
 	Chat chat = chatService.getChatByContentId((Long) map.get(AuthoringAction.KEY_TOOL_CONTENT_ID));
 
-	// update chat content using form inputs.
-	ToolAccessMode mode = (ToolAccessMode) map.get(AuthoringAction.KEY_MODE);
-	updateChat(chat, authForm, mode);
+	// update chat content using form inputs
+	updateChat(chat, authForm);
 
 	chatService.releaseConditionsFromCache(chat);
 
@@ -168,7 +159,7 @@
 	// set the update date
 	chat.setUpdateDate(new Date());
 
-	// releasing defineLater flag so that learner can start using the tool.
+	// releasing defineLater flag so that learners can start using the tool
 	chat.setDefineLater(false);
 
 	chatService.saveOrUpdateChat(chat);
@@ -192,16 +183,14 @@
      * @param mode
      * @return
      */
-    private void updateChat(Chat chat, AuthoringForm authForm, ToolAccessMode mode) {
+    private void updateChat(Chat chat, AuthoringForm authForm) {
 	chat.setTitle(authForm.getTitle());
 	chat.setInstructions(authForm.getInstructions());
-	if (mode.isAuthor()) { // Teacher cannot modify following
-	    chat.setLockOnFinished(authForm.isLockOnFinished());
-	    chat.setReflectOnActivity(authForm.isReflectOnActivity());
-	    chat.setReflectInstructions(authForm.getReflectInstructions());
-	    chat.setFilteringEnabled(authForm.isFilteringEnabled());
-	    chat.setFilterKeywords(authForm.getFilterKeywords());
-	}
+	chat.setLockOnFinished(authForm.isLockOnFinished());
+	chat.setReflectOnActivity(authForm.isReflectOnActivity());
+	chat.setReflectInstructions(authForm.getReflectInstructions());
+	chat.setFilteringEnabled(authForm.isFilteringEnabled());
+	chat.setFilterKeywords(authForm.getFilterKeywords());
     }
 
     /**
@@ -230,18 +219,18 @@
     private SessionMap<String, Object> createSessionMap(Chat chat, ToolAccessMode mode, String contentFolderID,
 	    Long toolContentID) {
 
-	SessionMap<String, Object> map = new SessionMap<String, Object>();
+	SessionMap<String, Object> sessionMap = new SessionMap<String, Object>();
 
-	map.put(AuthoringAction.KEY_MODE, mode);
-	map.put(AuthoringAction.KEY_CONTENT_FOLDER_ID, contentFolderID);
-	map.put(AuthoringAction.KEY_TOOL_CONTENT_ID, toolContentID);
+	sessionMap.put(AuthoringAction.KEY_MODE, mode);
+	sessionMap.put(AuthoringAction.KEY_CONTENT_FOLDER_ID, contentFolderID);
+	sessionMap.put(AuthoringAction.KEY_TOOL_CONTENT_ID, toolContentID);
+	
 	SortedSet<ChatCondition> set = new TreeSet<ChatCondition>(new TextSearchConditionComparator());
-
 	if (chat.getConditions() != null) {
 	    set.addAll(chat.getConditions());
 	}
-	map.put(ChatConstants.ATTR_CONDITION_SET, set);
-	return map;
+	sessionMap.put(ChatConstants.ATTR_CONDITION_SET, set);
+	return sessionMap;
     }
 
     /**
Index: lams_tool_chat/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r8955c559e118a75bcdec763ebae2e745a0421236 -r6cfcb91c5526d4bbb22cd98dbd9d04c175cba1eb
--- lams_tool_chat/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 8955c559e118a75bcdec763ebae2e745a0421236)
+++ lams_tool_chat/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 6cfcb91c5526d4bbb22cd98dbd9d04c175cba1eb)
@@ -6,11 +6,6 @@
 	<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="defineLater" value="no" />
-	<c:if test="${sessionMap.mode == 'teacher'}">
-		<c:set var="defineLater" value="yes" />
-	</c:if>
-
 	<html:hidden property="currentTab" styleId="currentTab" />
 	<html:hidden property="dispatch" value="updateContent" />
 	<html:hidden property="sessionMapID" />
@@ -20,10 +15,8 @@
 
 		<lams:Tabs control="true" title="${title}" helpToolSignature="<%= ChatConstants.TOOL_SIGNATURE %>" helpModule="authoring">
 			<lams:Tab id="1" key="button.basic" />
-			<c:if test="${sessionMap.mode == 'author'}">
-				<lams:Tab id="2" key="button.advanced" />
-				<lams:Tab id="3" key="button.conditions" />
-			</c:if>
+			<lams:Tab id="2" key="button.advanced" />
+			<lams:Tab id="3" key="button.conditions" />
 		</lams:Tabs>
 
 		<lams:TabBodyArea>
@@ -39,17 +32,15 @@
 			<%-- Page tabs --%>
 			<lams:TabBodys>
 				<lams:TabBody id="1" titleKey="button.basic" page="basic.jsp" />
-				<c:if test="${sessionMap.mode == 'author'}">
-					<lams:TabBody id="2" titleKey="button.advanced" page="advanced.jsp" />
-					<lams:TabBody id="3" titleKey="button.conditions" page="conditions.jsp" />
-				</c:if>
+				<lams:TabBody id="2" titleKey="button.advanced" page="advanced.jsp" />
+				<lams:TabBody id="3" titleKey="button.conditions" page="conditions.jsp" />
 			</lams:TabBodys>
 			
 			<lams:AuthoringButton formID="authoringForm"
 				clearSessionActionUrl="/clearsession.do" toolSignature="lachat11"
 				cancelButtonLabelKey="button.cancel" saveButtonLabelKey="button.save"
 				toolContentID="${sessionMap.toolContentID}"
-				accessMode="${sessionMap.mode}" defineLater="${defineLater}"
+				accessMode="${sessionMap.mode}" defineLater="${sessionMap.mode=='teacher'}"
 				customiseSessionID="${sessionMap.sessionID}"
 				contentFolderID="${sessionMap.contentFolderID}" />
 				
Index: lams_tool_chat/web/pages/monitoring/monitoring.jsp
===================================================================
diff -u -r8955c559e118a75bcdec763ebae2e745a0421236 -r6cfcb91c5526d4bbb22cd98dbd9d04c175cba1eb
--- lams_tool_chat/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 8955c559e118a75bcdec763ebae2e745a0421236)
+++ lams_tool_chat/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 6cfcb91c5526d4bbb22cd98dbd9d04c175cba1eb)
@@ -1,25 +1,25 @@
 <%@ include file="/common/taglibs.jsp"%>
 <%@ page import="org.lamsfoundation.lams.tool.chat.util.ChatConstants"%>
 
-	<c:set var="title"><fmt:message key="activity.title" /></c:set>
-	<lams:Page title="${title}" type="navbar">
+<c:set var="title"><fmt:message key="activity.title" /></c:set>
+<lams:Page title="${title}" type="navbar">
 
-		<lams:Tabs control="true" title="${title}" helpToolSignature="<%= ChatConstants.TOOL_SIGNATURE %>" helpModule="monitoring">
-			<lams:Tab id="1" key="button.summary" />
-			<lams:Tab id="2" key="button.editActivity" />
-			<lams:Tab id="3" key="button.statistics" />
-		</lams:Tabs>
-		<script type="text/javascript">
-			var initialTabId = "${requestScope.monitoringDTO.currentTab}";
-		</script>
+	<lams:Tabs control="true" title="${title}" helpToolSignature="<%= ChatConstants.TOOL_SIGNATURE %>" helpModule="monitoring">
+		<lams:Tab id="1" key="button.summary" />
+		<lams:Tab id="2" key="button.editActivity" />
+		<lams:Tab id="3" key="button.statistics" />
+	</lams:Tabs>
+	<script type="text/javascript">
+		var initialTabId = "${requestScope.monitoringDTO.currentTab}";
+	</script>
 
-		<lams:TabBodyArea>
+	<lams:TabBodyArea>
 		<lams:TabBodys>
 			<lams:TabBody id="1" titleKey="button.summary" page="summary.jsp" />
 			<lams:TabBody id="2" titleKey="button.editActivity" page="editActivity.jsp" />
 			<lams:TabBody id="3" titleKey="button.statistics" page="statistics.jsp" />
 		</lams:TabBodys>
-		</lams:TabBodyArea>
+	</lams:TabBodyArea>
 
-		<div id="footer"></div>
-	</lams:Page>
\ No newline at end of file
+	<div id="footer"></div>
+</lams:Page>
\ No newline at end of file
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/AuthoringAction.java
===================================================================
diff -u -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b -r6cfcb91c5526d4bbb22cd98dbd9d04c175cba1eb
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 6cfcb91c5526d4bbb22cd98dbd9d04c175cba1eb)
@@ -54,7 +54,7 @@
 import org.lamsfoundation.lams.web.util.SessionMap;
 
 /**
- * @author
+ * 
  */
 public class AuthoringAction extends LamsDispatchAction {
 
@@ -145,13 +145,7 @@
 	// get gmap content.
 	Gmap gmap = gmapService.getGmapByContentId(toolContentID);
 
-	// update gmap content using form inputs.
-	ToolAccessMode mode = (ToolAccessMode) map.get(KEY_MODE);
-
-	String contentFolderID = (String) map.get(AttributeNames.PARAM_CONTENT_FOLDER_ID);
 	GmapUser gmapUser = null;
-	//check whether it is sysadmin:LDEV-906 
-	//if(!StringUtils.equals(contentFolderID,"-1" )){
 	if (gmap.getCreateBy() == null) {
 	    HttpSession ss = SessionManager.getSession();
 	    UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
@@ -160,9 +154,9 @@
 	} else {
 	    gmapUser = gmapService.getUserByUID(gmap.getCreateBy());
 	}
-	//}
 
-	updateGmap(gmap, authForm, mode, gmapUser);
+	// update gmap content using form inputs
+	updateGmap(gmap, authForm, gmapUser);
 
 	// do the same for the gmap markers
 	Set<GmapMarker> markers = gmap.getGmapMarkers();
@@ -203,32 +197,30 @@
      * @param mode
      * @return
      */
-    private void updateGmap(Gmap gmap, AuthoringForm authForm, ToolAccessMode mode, GmapUser guser) {
+    private void updateGmap(Gmap gmap, AuthoringForm authForm, GmapUser guser) {
 	gmap.setTitle(authForm.getTitle());
 	gmap.setInstructions(authForm.getInstructions());
 
 	//updateMarkerListFromXML(authForm.getMarkersXML(), gmap, guser);
 	gmapService.updateMarkerListFromXML(authForm.getMarkersXML(), gmap, guser, true, null);
 
-	if (mode.isAuthor()) { // Teacher cannot modify following
-	    gmap.setCreateBy(guser.getUid());
-	    gmap.setLockOnFinished(authForm.isLockOnFinished());
-	    gmap.setAllowEditMarkers(authForm.isAllowEditMarkers());
-	    gmap.setAllowShowAllMarkers(authForm.isAllowShowAllMarkers());
-	    gmap.setMaxMarkers(authForm.getMaxMarkers());
-	    gmap.setLimitMarkers(authForm.isLimitMarkers());
-	    gmap.setAllowZoom(authForm.isAllowZoom());
-	    gmap.setAllowTerrain(authForm.isAllowTerrain());
-	    gmap.setAllowSatellite(authForm.isAllowSatellite());
-	    gmap.setAllowHybrid(authForm.isAllowHybrid());
-	    gmap.setMapType(authForm.getMapType());
-	    gmap.setMapZoom(authForm.getMapZoom());
-	    gmap.setMapCenterLatitude(authForm.getMapCenterLatitude());
-	    gmap.setMapCenterLongitude(authForm.getMapCenterLongitude());
-	    gmap.setReflectOnActivity(authForm.isReflectOnActivity());
-	    gmap.setReflectInstructions(authForm.getReflectInstructions());
-	    gmap.setDefaultGeocoderAddress(authForm.getDefaultGeocoderAddress());
-	}
+	gmap.setCreateBy(guser.getUid());
+	gmap.setLockOnFinished(authForm.isLockOnFinished());
+	gmap.setAllowEditMarkers(authForm.isAllowEditMarkers());
+	gmap.setAllowShowAllMarkers(authForm.isAllowShowAllMarkers());
+	gmap.setMaxMarkers(authForm.getMaxMarkers());
+	gmap.setLimitMarkers(authForm.isLimitMarkers());
+	gmap.setAllowZoom(authForm.isAllowZoom());
+	gmap.setAllowTerrain(authForm.isAllowTerrain());
+	gmap.setAllowSatellite(authForm.isAllowSatellite());
+	gmap.setAllowHybrid(authForm.isAllowHybrid());
+	gmap.setMapType(authForm.getMapType());
+	gmap.setMapZoom(authForm.getMapZoom());
+	gmap.setMapCenterLatitude(authForm.getMapCenterLatitude());
+	gmap.setMapCenterLongitude(authForm.getMapCenterLongitude());
+	gmap.setReflectOnActivity(authForm.isReflectOnActivity());
+	gmap.setReflectInstructions(authForm.getReflectInstructions());
+	gmap.setDefaultGeocoderAddress(authForm.getDefaultGeocoderAddress());
     }
 
     /**
Index: lams_tool_gmap/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r5b49576bf16056685db96302cc25b044bd39e9ce -r6cfcb91c5526d4bbb22cd98dbd9d04c175cba1eb
--- lams_tool_gmap/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 5b49576bf16056685db96302cc25b044bd39e9ce)
+++ lams_tool_gmap/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 6cfcb91c5526d4bbb22cd98dbd9d04c175cba1eb)
@@ -4,7 +4,6 @@
 
 <script type="text/javascript">
 	function onSubmitHandler() {
-
 		//boolean indicating whether we can proceed
     	var save = serialiseMarkers();
     	if (save) {
@@ -19,11 +18,6 @@
 	<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="defineLater" value="no" />
-	<c:if test="${sessionMap.mode == 'teacher'}">
-		<c:set var="defineLater" value="yes" />
-	</c:if>
-
 	<html:hidden property="currentTab" styleId="currentTab" />
 	<html:hidden property="dispatch" value="updateContent" />
 	<html:hidden property="sessionMapID" />
@@ -36,9 +30,7 @@
 	<c:set var="title"><fmt:message key="activity.title" /></c:set>
 	<lams:Tabs control="true" title="${title}" helpToolSignature="<%= GmapConstants.TOOL_SIGNATURE %>" helpModule="authoring">
 		<lams:Tab id="1" key="button.basic" />
-		<c:if test="${sessionMap.mode == 'author'}">
-			<lams:Tab id="2" key="button.advanced" />
-		</c:if>
+		<lams:Tab id="2" key="button.advanced" />
 	</lams:Tabs>
 	
 	<%-- Page tabs --%>
@@ -53,9 +45,7 @@
                 
         <lams:TabBodys>
 			<lams:TabBody id="1" titleKey="button.basic" page="basic.jsp" />
-			<c:if test="${sessionMap.mode == 'author'}">
-				<lams:TabBody id="2" titleKey="button.advanced" page="advanced.jsp" />
-			</c:if>
+			<lams:TabBody id="2" titleKey="button.advanced" page="advanced.jsp" />
 		</lams:TabBodys>
 
 		<lams:AuthoringButton formID="authoringForm"
@@ -65,7 +55,7 @@
 			saveButtonLabelKey="button.save"
 			toolContentID="${sessionMap.toolContentID}"
 			accessMode="${sessionMap.mode}" 
-			defineLater="${defineLater}"
+			defineLater="${sessionMap.mode=='teacher'}"
 			customiseSessionID="${sessionMap.sessionID}" 
 			contentFolderID="${sessionMap.contentFolderID}" />
 	
Index: lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/AuthoringAction.java
===================================================================
diff -u -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b -r6cfcb91c5526d4bbb22cd98dbd9d04c175cba1eb
--- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
+++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 6cfcb91c5526d4bbb22cd98dbd9d04c175cba1eb)
@@ -161,20 +161,17 @@
 	Long toolContentId = (Long) sessionMap.get(AuthoringAction.KEY_TOOL_CONTENT_ID);
 	Kaltura kaltura = kalturaService.getKalturaByContentId(toolContentId);
 
-	// update kaltura content using form inputs.
-	ToolAccessMode mode = (ToolAccessMode) sessionMap.get(AuthoringAction.KEY_MODE);
+	// update kaltura content using form inputs
 	kaltura.setTitle(authForm.getTitle());
 	kaltura.setInstructions(authForm.getInstructions());
-	if (mode.isAuthor()) { // Teacher cannot modify following
-	    kaltura.setLockOnFinished(authForm.isLockOnFinished());
-	    kaltura.setAllowContributeVideos(authForm.isAllowContributeVideos());
-	    kaltura.setLearnerContributionLimit(authForm.getLearnerContributionLimit());
-	    kaltura.setAllowSeeingOtherUsersRecordings(authForm.isAllowSeeingOtherUsersRecordings());
-	    kaltura.setAllowComments(authForm.isAllowComments());
-	    kaltura.setAllowRatings(authForm.isAllowRatings());
-	    kaltura.setReflectOnActivity(authForm.isReflectOnActivity());
-	    kaltura.setReflectInstructions(authForm.getReflectInstructions());
-	}
+	kaltura.setLockOnFinished(authForm.isLockOnFinished());
+	kaltura.setAllowContributeVideos(authForm.isAllowContributeVideos());
+	kaltura.setLearnerContributionLimit(authForm.getLearnerContributionLimit());
+	kaltura.setAllowSeeingOtherUsersRecordings(authForm.isAllowSeeingOtherUsersRecordings());
+	kaltura.setAllowComments(authForm.isAllowComments());
+	kaltura.setAllowRatings(authForm.isAllowRatings());
+	kaltura.setReflectOnActivity(authForm.isReflectOnActivity());
+	kaltura.setReflectInstructions(authForm.getReflectInstructions());
 
 	// *******************************Handle user*******************
 	HttpSession ss = SessionManager.getSession();
Index: lams_tool_kaltura/web/pages/authoring/authoring.jsp
===================================================================
diff -u -re535a51e19cbc72d07bda00b019c947847d869b0 -r6cfcb91c5526d4bbb22cd98dbd9d04c175cba1eb
--- lams_tool_kaltura/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision e535a51e19cbc72d07bda00b019c947847d869b0)
+++ lams_tool_kaltura/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 6cfcb91c5526d4bbb22cd98dbd9d04c175cba1eb)
@@ -4,10 +4,6 @@
 <html:form action="/authoring" styleId="authoringForm" method="post" 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]}" />
-	<c:set var="defineLater" value="no" />
-	<c:if test="${sessionMap.mode == 'teacher'}">
-		<c:set var="defineLater" value="yes" />
-	</c:if>
 	
 	<html:hidden property="currentTab" styleId="currentTab" />
 	<html:hidden property="dispatch" value="updateContent" />
@@ -16,9 +12,7 @@
 	<c:set var="title"><fmt:message key="activity.title" /></c:set>
 	<lams:Tabs control="true" title="${title}" helpToolSignature="<%= KalturaConstants.TOOL_SIGNATURE %>" helpModule="authoring">
 		<lams:Tab id="1" key="button.basic" />
-		<c:if test="${sessionMap.mode == 'author'}">
-			<lams:Tab id="2" key="button.advanced" />
-		</c:if>
+		<lams:Tab id="2" key="button.advanced" />
 	</lams:Tabs>
 	
 	<lams:TabBodyArea>
@@ -27,9 +21,7 @@
 		<!--  Set up tabs  -->
 		<lams:TabBodys>
    			<lams:TabBody id="1" titleKey="button.basic" page="basic.jsp" />
-   			<c:if test="${sessionMap.mode == 'author'}">
- 				<lams:TabBody id="2" titleKey="button.advanced" page="advanced.jsp" />
- 			</c:if>
+ 			<lams:TabBody id="2" titleKey="button.advanced" page="advanced.jsp" />
   		</lams:TabBodys>
 		
 		<!-- Button Row -->
@@ -38,7 +30,7 @@
 				clearSessionActionUrl="/clearsession.do" toolSignature="<%=KalturaConstants.TOOL_SIGNATURE%>"
 				cancelButtonLabelKey="button.cancel" saveButtonLabelKey="button.save"
 				toolContentID="${sessionMap.toolContentID}"
-				accessMode="${sessionMap.mode}" defineLater="${defineLater}"
+				accessMode="${sessionMap.mode}" defineLater="${sessionMap.mode=='teacher'}"
 				contentFolderID="${sessionMap.contentFolderID}" />
 		</div>
 	</lams:TabBodyArea>
Index: lams_tool_leader/web/pages/authoring/authoring.jsp
===================================================================
diff -u -ra6f139bf7f2aeceb96792867e30e3de3959bd1f0 -r6cfcb91c5526d4bbb22cd98dbd9d04c175cba1eb
--- lams_tool_leader/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision a6f139bf7f2aeceb96792867e30e3de3959bd1f0)
+++ lams_tool_leader/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 6cfcb91c5526d4bbb22cd98dbd9d04c175cba1eb)
@@ -7,11 +7,6 @@
 	<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="defineLater" value="no" />
-	<c:if test="${sessionMap.mode == 'teacher'}">
-		<c:set var="defineLater" value="yes" />
-	</c:if>
-
 	<c:set var="title"><fmt:message key="activity.title" /></c:set>
 	<lams:Page title="${title}" type="navbar">		
 	
@@ -43,7 +38,7 @@
 				clearSessionActionUrl="/clearsession.do" toolSignature="lalead11"
 				cancelButtonLabelKey="button.cancel" saveButtonLabelKey="button.save"
 				toolContentID="${sessionMap.toolContentID}"
-				accessMode="${sessionMap.mode}" defineLater="${defineLater}"
+				accessMode="${sessionMap.mode}" defineLater="${sessionMap.mode=='teacher'}"
 				customiseSessionID="${sessionMap.sessionID}" 
 				contentFolderID="${sessionMap.contentFolderID}" />
 		</lams:TabBodyArea>
Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/AuthoringAction.java
===================================================================
diff -u -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b -r6cfcb91c5526d4bbb22cd98dbd9d04c175cba1eb
--- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
+++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 6cfcb91c5526d4bbb22cd98dbd9d04c175cba1eb)
@@ -234,9 +234,8 @@
 	// get mindmap content.
 	Mindmap mindmap = mindmapService.getMindmapByContentId((Long) map.get(AuthoringAction.KEY_TOOL_CONTENT_ID));
 
-	// update mindmap content using form inputs.
-	ToolAccessMode mode = (ToolAccessMode) map.get(AuthoringAction.KEY_MODE);
-	updateMindmap(mindmap, authForm, mode);
+	// update mindmap content using form inputs
+	updateMindmap(mindmap, authForm);
 
 	// set the update date
 	mindmap.setUpdateDate(new Date());
@@ -292,16 +291,14 @@
      * @param authForm
      * @param mode
      */
-    private void updateMindmap(Mindmap mindmap, AuthoringForm authForm, ToolAccessMode mode) {
+    private void updateMindmap(Mindmap mindmap, AuthoringForm authForm) {
 	mindmap.setTitle(authForm.getTitle());
 	mindmap.setInstructions(authForm.getInstructions());
-	if (mode.isAuthor()) { // Teacher cannot modify following
-	    mindmap.setLockOnFinished(authForm.isLockOnFinished());
-	    mindmap.setMultiUserMode(authForm.isMultiUserMode());
-	    // reflection
-	    mindmap.setReflectOnActivity(authForm.isReflectOnActivity());
-	    mindmap.setReflectInstructions(authForm.getReflectInstructions());
-	}
+	mindmap.setLockOnFinished(authForm.isLockOnFinished());
+	mindmap.setMultiUserMode(authForm.isMultiUserMode());
+	// reflection
+	mindmap.setReflectOnActivity(authForm.isReflectOnActivity());
+	mindmap.setReflectInstructions(authForm.getReflectInstructions());
     }
 
     /**
Index: lams_tool_mindmap/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r4594910a2d277a10438f879988089235c074d42e -r6cfcb91c5526d4bbb22cd98dbd9d04c175cba1eb
--- lams_tool_mindmap/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 4594910a2d277a10438f879988089235c074d42e)
+++ lams_tool_mindmap/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 6cfcb91c5526d4bbb22cd98dbd9d04c175cba1eb)
@@ -50,10 +50,6 @@
 <html:form action="/authoring" styleId="authoringForm" method="post" 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]}" />
-	<c:set var="defineLater" value="no" />
-	<c:if test="${sessionMap.mode == 'teacher'}">
-		<c:set var="defineLater" value="yes" />
-	</c:if>
 	
 	<html:hidden property="currentTab" styleId="currentTab" />
 	<html:hidden property="dispatch" value="updateContent" />
@@ -63,9 +59,7 @@
 	<c:set var="title"><fmt:message key="activity.title" /></c:set>
 	<lams:Tabs control="true" title="${title}" helpToolSignature="<%= MindmapConstants.TOOL_SIGNATURE %>" helpModule="authoring">
 		<lams:Tab id="1" key="button.basic" />
-		<c:if test="${sessionMap.mode == 'author'}">
-			<lams:Tab id="2" key="button.advanced" />
-		</c:if>
+		<lams:Tab id="2" key="button.advanced" />
 	</lams:Tabs>
 	
 	<lams:TabBodyArea>
@@ -74,9 +68,7 @@
 		<!--  Set up tabs  -->
 		<lams:TabBodys>
    			<lams:TabBody id="1" titleKey="button.basic" page="basic.jsp" />
-   			<c:if test="${sessionMap.mode == 'author'}">
- 				<lams:TabBody id="2" titleKey="button.advanced" page="advanced.jsp" />
- 			</c:if>
+ 			<lams:TabBody id="2" titleKey="button.advanced" page="advanced.jsp" />
   		</lams:TabBodys>
 		
 		<!-- Button Row -->
@@ -85,7 +77,7 @@
 				clearSessionActionUrl="/clearsession.do" toolSignature="<%=MindmapConstants.TOOL_SIGNATURE%>"
 				cancelButtonLabelKey="button.cancel" saveButtonLabelKey="button.save"
 				toolContentID="${sessionMap.toolContentID}"
-				accessMode="${sessionMap.mode}" defineLater="${defineLater}"
+				accessMode="${sessionMap.mode}" defineLater="${sessionMap.mode=='teacher'}"
 				contentFolderID="${sessionMap.contentFolderID}" />
 		</div>
 	</lams:TabBodyArea>
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/AuthoringAction.java
===================================================================
diff -u -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b -r6cfcb91c5526d4bbb22cd98dbd9d04c175cba1eb
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 6cfcb91c5526d4bbb22cd98dbd9d04c175cba1eb)
@@ -139,9 +139,8 @@
 	// get notebook content.
 	Notebook notebook = notebookService.getNotebookByContentId((Long) map.get(AuthoringAction.KEY_TOOL_CONTENT_ID));
 
-	// update notebook content using form inputs.
-	ToolAccessMode mode = (ToolAccessMode) map.get(AuthoringAction.KEY_MODE);
-	updateNotebook(notebook, authForm, mode);
+	// update notebook content using form inputs
+	updateNotebook(notebook, authForm);
 
 	notebookService.releaseConditionsFromCache(notebook);
 
@@ -193,15 +192,12 @@
      * @param mode
      * @return
      */
-    private void updateNotebook(Notebook notebook, AuthoringForm authForm, ToolAccessMode mode) {
+    private void updateNotebook(Notebook notebook, AuthoringForm authForm) {
 	notebook.setTitle(authForm.getTitle());
 	notebook.setInstructions(authForm.getInstructions());
-	if (mode.isAuthor()) { // Teacher cannot modify following
-	    notebook.setForceResponse(authForm.isForceResponse());
-	    notebook.setLockOnFinished(authForm.isLockOnFinished());
-	    notebook.setAllowRichEditor(authForm.isAllowRichEditor());
-
-	}
+	notebook.setForceResponse(authForm.isForceResponse());
+	notebook.setLockOnFinished(authForm.isLockOnFinished());
+	notebook.setAllowRichEditor(authForm.isAllowRichEditor());
     }
 
     /**
Index: lams_tool_notebook/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r44d676771d33765afea5cef0fe63850366839806 -r6cfcb91c5526d4bbb22cd98dbd9d04c175cba1eb
--- lams_tool_notebook/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 44d676771d33765afea5cef0fe63850366839806)
+++ lams_tool_notebook/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 6cfcb91c5526d4bbb22cd98dbd9d04c175cba1eb)
@@ -13,10 +13,8 @@
 
 	<lams:Tabs control="true" title="${title}" helpToolSignature="<%= NotebookConstants.TOOL_SIGNATURE %>" helpModule="authoring">
 		<lams:Tab id="1" key="button.basic" />
-		<c:if test="${sessionMap.mode == 'author'}">
-			<lams:Tab id="2" key="button.advanced" />
-			<lams:Tab id="3" key="button.conditions" />
-		</c:if>
+		<lams:Tab id="2" key="button.advanced" />
+		<lams:Tab id="3" key="button.conditions" />
 	</lams:Tabs>  
 	
 	<lams:TabBodyArea>
@@ -25,10 +23,8 @@
 	    <!--  Set up tabs  -->
 	     <lams:TabBodys>
 			<lams:TabBody id="1" titleKey="button.basic" page="basic.jsp" />
-			<c:if test="${sessionMap.mode == 'author'}">
-				<lams:TabBody id="2" titleKey="button.advanced" page="advanced.jsp" />
-				<lams:TabBody id="3" titleKey="button.conditions" page="conditions.jsp" />
-			</c:if>
+			<lams:TabBody id="2" titleKey="button.advanced" page="advanced.jsp" />
+			<lams:TabBody id="3" titleKey="button.conditions" page="conditions.jsp" />
 	    </lams:TabBodys>
 
 
Index: lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/AuthoringAction.java
===================================================================
diff -u -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b -r6cfcb91c5526d4bbb22cd98dbd9d04c175cba1eb
--- lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
+++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 6cfcb91c5526d4bbb22cd98dbd9d04c175cba1eb)
@@ -167,7 +167,6 @@
 	// get pixlr content.
 	Pixlr pixlr = pixlrService.getPixlrByContentId((Long) map.get(AuthoringAction.KEY_TOOL_CONTENT_ID));
 	ActionErrors errors = new ActionErrors();
-	;
 
 	try {
 	    // TODO: Need to check if this is an edit, if so, delete the old image
@@ -194,7 +193,7 @@
 	}
 
 	// update pixlr content using form inputs.
-	updatePixlr(pixlr, authForm, mode);
+	updatePixlr(pixlr, authForm);
 
 	// set the update date
 	pixlr.setUpdateDate(new Date());
@@ -230,15 +229,13 @@
      * @param mode
      * @return
      */
-    private void updatePixlr(Pixlr pixlr, AuthoringForm authForm, ToolAccessMode mode) {
+    private void updatePixlr(Pixlr pixlr, AuthoringForm authForm) {
 	pixlr.setTitle(authForm.getTitle());
 	pixlr.setInstructions(authForm.getInstructions());
-	if (mode.isAuthor()) { // Teacher cannot modify following
-	    pixlr.setLockOnFinished(authForm.isLockOnFinished());
-	    pixlr.setReflectOnActivity(authForm.isReflectOnActivity());
-	    pixlr.setReflectInstructions(authForm.getReflectInstructions());
-	    pixlr.setAllowViewOthersImages(authForm.isAllowViewOthersImages());
-	}
+	pixlr.setLockOnFinished(authForm.isLockOnFinished());
+	pixlr.setReflectOnActivity(authForm.isReflectOnActivity());
+	pixlr.setReflectInstructions(authForm.getReflectInstructions());
+	pixlr.setAllowViewOthersImages(authForm.isAllowViewOthersImages());
     }
 
     /**
Index: lams_tool_pixlr/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r3765e0fe6f3b1bfa7c071328c3c1bd1673c0fe9b -r6cfcb91c5526d4bbb22cd98dbd9d04c175cba1eb
--- lams_tool_pixlr/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 3765e0fe6f3b1bfa7c071328c3c1bd1673c0fe9b)
+++ lams_tool_pixlr/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 6cfcb91c5526d4bbb22cd98dbd9d04c175cba1eb)
@@ -29,10 +29,6 @@
 <html:form action="/authoring" styleId="authoringForm" method="post" enctype="multipart/form-data" onsubmit="return validate();">
 	<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="defineLater" value="no" />
-	<c:if test="${sessionMap.mode == 'teacher'}">
-		<c:set var="defineLater" value="yes" />
-	</c:if>
 	
 	<html:hidden property="currentTab" styleId="currentTab" />
 	<html:hidden property="dispatch"  styleId="dispatch" value="updateContent" />
@@ -45,9 +41,7 @@
 	<c:set var="title"><fmt:message key="activity.title" /></c:set>
 	<lams:Tabs control="true" title="${title}" helpToolSignature="<%= PixlrConstants.TOOL_SIGNATURE %>" helpModule="authoring">
 		<lams:Tab id="1" key="button.basic" />
-		<c:if test="${sessionMap.mode == 'author'}">
-			<lams:Tab id="2" key="button.advanced" />
-		</c:if>
+		<lams:Tab id="2" key="button.advanced" />
 	</lams:Tabs>
 
 	<lams:TabBodyArea>
@@ -56,9 +50,7 @@
 		<!--  Set up tabs  -->
 		<lams:TabBodys>
    			<lams:TabBody id="1" titleKey="button.basic" page="basic.jsp" />
-   			<c:if test="${sessionMap.mode == 'author'}">
- 				<lams:TabBody id="2" titleKey="button.advanced" page="advanced.jsp" />
- 			</c:if>
+ 			<lams:TabBody id="2" titleKey="button.advanced" page="advanced.jsp" />
   		</lams:TabBodys>
 		
 		<!-- Button Row -->
@@ -67,7 +59,7 @@
 				clearSessionActionUrl="/clearsession.do" toolSignature="<%=PixlrConstants.TOOL_SIGNATURE%>"
 				cancelButtonLabelKey="button.cancel" saveButtonLabelKey="button.save"
 				toolContentID="${sessionMap.toolContentID}"
-				accessMode="${sessionMap.mode}" defineLater="${defineLater}"
+				accessMode="${sessionMap.mode}" defineLater="${sessionMap.mode == 'teacher'}"
 				contentFolderID="${sessionMap.contentFolderID}" />
 		</div>
 	</lams:TabBodyArea>
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java
===================================================================
diff -u -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b -r6cfcb91c5526d4bbb22cd98dbd9d04c175cba1eb
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java	(.../AuthoringAction.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java	(.../AuthoringAction.java)	(revision 6cfcb91c5526d4bbb22cd98dbd9d04c175cba1eb)
@@ -77,15 +77,7 @@
     protected ActionForward unspecified(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) {
 
-	ToolAccessMode mode = null;
-	try {
-	    mode = WebUtil.readToolAccessModeParam(request, AttributeNames.PARAM_MODE, true);
-	} catch (Exception e) {
-	}
-	// when first time open flash icon on authoring page: mode will be null
-	if (mode == null) {
-	    mode = ToolAccessMode.AUTHOR;
-	}
+	ToolAccessMode mode = WebUtil.readToolAccessModeAuthorDefaulted(request);
 
 	SessionMap<String, Object> sessionMap = new SessionMap<String, Object>();
 	request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
@@ -117,7 +109,6 @@
 	// session map
 	authForm.setSessionMapID(sessionMap.getSessionID());
 	authForm.setContentFolderID(contentFolderID);
-	
 
 	return mapping.findForward("success");
     }
@@ -139,17 +130,8 @@
 
 	AuthoringForm authForm = (AuthoringForm) form;
 	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession().getAttribute(authForm.getSessionMapID());
+	ToolAccessMode mode = (ToolAccessMode) sessionMap.get(AttributeNames.PARAM_MODE);
 
-	ToolAccessMode mode = null;
-	try {
-	    mode = WebUtil.readToolAccessModeParam(request, AttributeNames.PARAM_MODE, true);
-	} catch (Exception e) {
-	}
-	// when first time open flash icon on authoring page: mode will be null
-	if (mode == null) {
-	    mode = ToolAccessMode.AUTHOR;
-	}
-
 	ActionMessages errors = validate(authForm, mapping, request);
 	if (!errors.isEmpty()) {
 	    saveErrors(request, errors);
@@ -166,16 +148,13 @@
 	    persistContent = content;
 	    content.setCreated(new Date());
 	} else {
-	    // copy web page value into persist content, as above, the "Set" type value kept.
-	    if (mode.isAuthor()) {
-		Long uid = persistContent.getContentID();
-		PropertyUtils.copyProperties(persistContent, content);
-		persistContent.setContentID(uid);
-	    } else {
-		// if it is Teacher, then just update basic tab content (definelater)
-		persistContent.setInstruction(content.getInstruction());
-		persistContent.setTitle(content.getTitle());
-		// change define later status
+
+	    Long uid = persistContent.getContentID();
+	    PropertyUtils.copyProperties(persistContent, content);
+	    persistContent.setContentID(uid);
+
+	    // if it is Teacher (from monitor) - change define later status
+	    if (mode.isTeacher()) {
 		persistContent.setDefineLater(false);
 	    }
 	}
Index: lams_tool_sbmt/web/authoring/authoring.jsp
===================================================================
diff -u -r6bed0e62245e6c9ce454d4bc54920a0b41dac9bc -r6cfcb91c5526d4bbb22cd98dbd9d04c175cba1eb
--- lams_tool_sbmt/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision 6bed0e62245e6c9ce454d4bc54920a0b41dac9bc)
+++ lams_tool_sbmt/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision 6cfcb91c5526d4bbb22cd98dbd9d04c175cba1eb)
@@ -34,39 +34,34 @@
 	<html:hidden property="toolContentID" />
 	<html:hidden property="contentFolderID" />
 	
-<lams:Page title="${title}" type="navbar">
-	
-	<lams:Tabs control="true" title="${title}" helpToolSignature="<%= SbmtConstants.TOOL_SIGNATURE %>" helpModule="authoring">
-		<lams:Tab id="1" key="label.authoring.heading.basic" />
-		<c:if test="${sessionMap.mode == 'author'}">
+	<lams:Page title="${title}" type="navbar">
+		
+		<lams:Tabs control="true" title="${title}" helpToolSignature="<%= SbmtConstants.TOOL_SIGNATURE %>" helpModule="authoring">
+			<lams:Tab id="1" key="label.authoring.heading.basic" />
 			<lams:Tab id="2" key="label.authoring.heading.advance" />
-		</c:if>
-	</lams:Tabs> 
+		</lams:Tabs> 
+		
+		<lams:TabBodyArea>
+			<%@ include file="/common/messages.jsp"%>
 	
-	<lams:TabBodyArea>
-		<%@ include file="/common/messages.jsp"%>
-
-	     <lams:TabBodys>
-			<lams:TabBody id="1" titleKey="label.authoring.heading.basic.desc" page="basic.jsp" />
-			<c:if test="${sessionMap.mode == 'author'}">
+		     <lams:TabBodys>
+				<lams:TabBody id="1" titleKey="label.authoring.heading.basic.desc" page="basic.jsp" />
 				<lams:TabBody id="2" titleKey="label.authoring.heading.advance.desc" page="advance.jsp" />
-			</c:if>
-	    </lams:TabBodys>
-
-
-		<lams:AuthoringButton formID="authoringForm"
-			clearSessionActionUrl="/clearsession.do"
-			toolSignature="<%=SbmtConstants.TOOL_SIGNATURE%>"
-			accessMode="${sessionMap.mode}"
-			defineLater="${sessionMap.mode == 'teacher'}"
-			toolContentID="${formBean.toolContentID}"
-			customiseSessionID="${formBean.sessionMapID}" 
-			contentFolderID="${formBean.contentFolderID}" />
-	</lams:TabBodyArea>
+		    </lams:TabBodys>
 	
-	<div id="footer"></div>
-	
-</lams:Page>
+			<lams:AuthoringButton formID="authoringForm"
+				clearSessionActionUrl="/clearsession.do"
+				toolSignature="<%=SbmtConstants.TOOL_SIGNATURE%>"
+				accessMode="${sessionMap.mode}"
+				defineLater="${sessionMap.mode == 'teacher'}"
+				toolContentID="${formBean.toolContentID}"
+				customiseSessionID="${formBean.sessionMapID}" 
+				contentFolderID="${formBean.contentFolderID}" />
+		</lams:TabBodyArea>
+		
+		<div id="footer"></div>
+		
+	</lams:Page>
 </html:form>
 </body>
 </lams:html>
\ No newline at end of file
Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/AuthoringAction.java
===================================================================
diff -u -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b -r6cfcb91c5526d4bbb22cd98dbd9d04c175cba1eb
--- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
+++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 6cfcb91c5526d4bbb22cd98dbd9d04c175cba1eb)
@@ -157,9 +157,8 @@
 	// get scribe content.
 	Scribe scribe = scribeService.getScribeByContentId((Long) map.get(KEY_TOOL_CONTENT_ID));
 
-	// update scribe content using form inputs.
-	ToolAccessMode mode = (ToolAccessMode) map.get(KEY_MODE);
-	updateScribe(scribe, authForm, mode);
+	// update scribe content using form inputs
+	updateScribe(scribe, authForm);
 
 	// update headings.
 	List<ScribeHeading> updatedHeadings = getHeadingList(map);
@@ -336,15 +335,13 @@
      * @param mode
      * @return
      */
-    private void updateScribe(Scribe scribe, AuthoringForm authForm, ToolAccessMode mode) {
+    private void updateScribe(Scribe scribe, AuthoringForm authForm) {
 	scribe.setTitle(authForm.getTitle());
 	scribe.setInstructions(authForm.getInstructions());
-	if (mode.isAuthor()) { // Teacher cannot modify following
-	    scribe.setReflectOnActivity(authForm.isReflectOnActivity());
-	    scribe.setReflectInstructions(authForm.getReflectInstructions());
-	    scribe.setAutoSelectScribe(authForm.isAutoSelectScribe());
-	    scribe.setShowAggregatedReports(authForm.isShowAggregatedReports());
-	}
+	scribe.setReflectOnActivity(authForm.isReflectOnActivity());
+	scribe.setReflectInstructions(authForm.getReflectInstructions());
+	scribe.setAutoSelectScribe(authForm.isAutoSelectScribe());
+	scribe.setShowAggregatedReports(authForm.isShowAggregatedReports());
     }
 
     /**
Index: lams_tool_scribe/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r9732fd6b134b021525bf6be0e8cad758e6beae05 -r6cfcb91c5526d4bbb22cd98dbd9d04c175cba1eb
--- lams_tool_scribe/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 9732fd6b134b021525bf6be0e8cad758e6beae05)
+++ lams_tool_scribe/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 6cfcb91c5526d4bbb22cd98dbd9d04c175cba1eb)
@@ -6,19 +6,12 @@
 	<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="defineLater" value="no" />
-	<c:if test="${sessionMap.mode == 'teacher'}">
-		<c:set var="defineLater" value="yes" />
-	</c:if>
-
 	<c:set var="title"><fmt:message key="activity.title" /></c:set>
 	<lams:Page title="${title}" type="navbar">
 
 		<lams:Tabs control="true" title="${title}" helpToolSignature="<%= ScribeConstants.TOOL_SIGNATURE %>" helpModule="authoring">
-				<lams:Tab id="1" key="button.basic" />
-				<c:if test="${sessionMap.mode == 'author'}">
-					<lams:Tab id="2" key="button.advanced" />
-				</c:if>
+			<lams:Tab id="1" key="button.basic" />
+			<lams:Tab id="2" key="button.advanced" />
 		</lams:Tabs>
 
 		<html:hidden property="currentTab" styleId="currentTab" />
@@ -47,7 +40,7 @@
 				clearSessionActionUrl="/clearsession.do" toolSignature="lascrb11"
 				cancelButtonLabelKey="button.cancel" saveButtonLabelKey="button.save"
 				toolContentID="${sessionMap.toolContentID}"
-				accessMode="${sessionMap.mode}" defineLater="${defineLater}"
+				accessMode="${sessionMap.mode}" defineLater="${sessionMap.mode == 'teacher'}"
 				customiseSessionID="${sessionMap.sessionID}"
 				contentFolderID="${sessionMap.contentFolderID}" />
 		</lams:TabBodyArea>
Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/AuthoringAction.java
===================================================================
diff -u -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b -r6cfcb91c5526d4bbb22cd98dbd9d04c175cba1eb
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 6cfcb91c5526d4bbb22cd98dbd9d04c175cba1eb)
@@ -60,13 +60,6 @@
  * learner, monitor and author
  *
  * @author lfoxton
- * @version
- *
- *
- *
- *
- *
- *
  */
 public class AuthoringAction extends WikiPageAction {
 
@@ -244,9 +237,8 @@
 	// get wiki content.
 	Wiki wiki = wikiService.getWikiByContentId((Long) map.get(AuthoringAction.KEY_TOOL_CONTENT_ID));
 
-	// update wiki content using form inputs.
-	ToolAccessMode mode = (ToolAccessMode) map.get(AuthoringAction.KEY_MODE);
-	updateWiki(wiki, authForm, mode);
+	// update wiki content using form inputs
+	updateWiki(wiki, authForm);
 
 	// set the update date
 	wiki.setUpdateDate(new Date());
@@ -273,7 +265,7 @@
      * @param mode
      * @return
      */
-    private void updateWiki(Wiki wiki, AuthoringForm authForm, ToolAccessMode mode) {
+    private void updateWiki(Wiki wiki, AuthoringForm authForm) {
 	// wiki.setTitle(authForm.getTitle());
 	WikiPage mainPage = wiki.getMainPage();
 	// mainPage.setTitle(authForm.getTitle());
@@ -283,18 +275,15 @@
 	// mainPage.setCurrentWikiContent(content);
 
 	wiki.setMainPage(mainPage);
-
-	if (mode.isAuthor()) { // Teacher cannot modify following
-	    wiki.setLockOnFinished(authForm.isLockOnFinished());
-	    wiki.setAllowLearnerAttachImages(authForm.isAllowLearnerAttachImages());
-	    wiki.setAllowLearnerCreatePages(authForm.isAllowLearnerCreatePages());
-	    wiki.setAllowLearnerInsertLinks(authForm.isAllowLearnerInsertLinks());
-	    wiki.setReflectOnActivity(authForm.isReflectOnActivity());
-	    wiki.setReflectInstructions(authForm.getReflectInstructions());
-	    wiki.setNotifyUpdates(authForm.isNotifyUpdates());
-	    wiki.setMaximumEdits(authForm.getMaximumEdits());
-	    wiki.setMinimumEdits(authForm.getMinimumEdits());
-	}
+	wiki.setLockOnFinished(authForm.isLockOnFinished());
+	wiki.setAllowLearnerAttachImages(authForm.isAllowLearnerAttachImages());
+	wiki.setAllowLearnerCreatePages(authForm.isAllowLearnerCreatePages());
+	wiki.setAllowLearnerInsertLinks(authForm.isAllowLearnerInsertLinks());
+	wiki.setReflectOnActivity(authForm.isReflectOnActivity());
+	wiki.setReflectInstructions(authForm.getReflectInstructions());
+	wiki.setNotifyUpdates(authForm.isNotifyUpdates());
+	wiki.setMaximumEdits(authForm.getMaximumEdits());
+	wiki.setMinimumEdits(authForm.getMinimumEdits());
     }
 
     /**
Index: lams_tool_wiki/web/pages/authoring/authoring.jsp
===================================================================
diff -u -rceae3062bc6d9ad73937168fc0fb12e4fdaa172d -r6cfcb91c5526d4bbb22cd98dbd9d04c175cba1eb
--- lams_tool_wiki/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision ceae3062bc6d9ad73937168fc0fb12e4fdaa172d)
+++ lams_tool_wiki/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 6cfcb91c5526d4bbb22cd98dbd9d04c175cba1eb)
@@ -6,11 +6,6 @@
 
 	<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="defineLater" value="no" scope="request" />
-	<c:if test="${sessionMap.mode == 'teacher'}">
-		<c:set var="defineLater" value="yes" scope="request" />
-	</c:if>
 
 	<html:hidden property="currentTab" styleId="currentTab" />
 	<html:hidden property="dispatch" styleId="dispatch" value="updateContent" />
@@ -27,9 +22,7 @@
 
 		 <lams:Tabs control="true" title="${title}" helpToolSignature="<%= WikiConstants.TOOL_SIGNATURE %>" helpModule="authoring">
 			<lams:Tab id="1" key="button.basic" />
-			<c:if test="${sessionMap.mode == 'author'}">
-				<lams:Tab id="2" key="button.advanced" />
-			</c:if>
+			<lams:Tab id="2" key="button.advanced" />
 		</lams:Tabs>
 
 		<c:if test="${currentWikiPage.deleted}">
@@ -50,17 +43,15 @@
 			<%-- Page tabs --%>
 			<lams:TabBodys>
 				<lams:TabBody id="1" titleKey="button.basic" page="basic.jsp" />
-				<c:if test="${sessionMap.mode == 'author'}">
-					<lams:TabBody id="2" titleKey="button.advanced" page="advanced.jsp" />
-				</c:if>
+				<lams:TabBody id="2" titleKey="button.advanced" page="advanced.jsp" />
 			</lams:TabBodys>
 				
 			<div id="finishButtonDiv">
 				<lams:AuthoringButton formID="authoringForm"
 					clearSessionActionUrl="/clearsession.do" toolSignature="lawiki10"
 					cancelButtonLabelKey="button.cancel" saveButtonLabelKey="button.save"
 					toolContentID="${sessionMap.toolContentID}"
-					accessMode="${sessionMap.mode}" defineLater="${defineLater}"
+					accessMode="${sessionMap.mode}" defineLater="${sessionMap.mode == 'teacher'}"
 					customiseSessionID="${sessionMap.sessionID}" 
 					contentFolderID="${sessionMap.contentFolderID}" />
 			</div>