Index: lams_tool_bbb/web/pages/monitoring/editActivity.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_bbb/web/pages/monitoring/editActivity.jsp,v
diff -u -r1.2.2.3 -r1.2.2.4
--- lams_tool_bbb/web/pages/monitoring/editActivity.jsp	5 Apr 2017 16:44:16 -0000	1.2.2.3
+++ lams_tool_bbb/web/pages/monitoring/editActivity.jsp	7 Apr 2017 14:25:25 -0000	1.2.2.4
@@ -32,7 +32,7 @@
 	<c:param name="mode" value="teacher" />
 	<c:param name="contentFolderID" value="${contentFolderID}" />
 </c:url>
-<html:link href="${authoringUrl}" styleClass="btn btn-default voffset5">
+<html:link href="#nogo" onclick="javascript:launchPopup('${authoringUrl}','definelater')" styleClass="btn btn-default pull-right">
 	<fmt:message key="button.editActivity" />
 </html:link>
 
Index: lams_tool_chat/web/pages/monitoring/editActivity.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/web/pages/monitoring/editActivity.jsp,v
diff -u -r1.10.2.1 -r1.10.2.2
--- lams_tool_chat/web/pages/monitoring/editActivity.jsp	25 May 2016 12:46:57 -0000	1.10.2.1
+++ lams_tool_chat/web/pages/monitoring/editActivity.jsp	7 Apr 2017 14:25:45 -0000	1.10.2.2
@@ -34,7 +34,7 @@
 	<c:param name="mode" value="teacher" />
 	<c:param name="contentFolderID" value="${contentFolderID}"></c:param>
 </c:url>
-<a href="#" onClick="javascript:launchPopup('${authoringUrl}')" class="btn btn-default">
+<a href="#" onClick="javascript:launchPopup('${authoringUrl}')" class="btn btn-default pull-right">
 	<fmt:message key="button.editActivity" />
 </a>
 
Index: lams_tool_daco/web/pages/monitoring/editactivity.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/web/pages/monitoring/editactivity.jsp,v
diff -u -r1.5.2.2 -r1.5.2.3
--- lams_tool_daco/web/pages/monitoring/editactivity.jsp	15 Apr 2016 11:47:25 -0000	1.5.2.2
+++ lams_tool_daco/web/pages/monitoring/editactivity.jsp	7 Apr 2017 14:25:27 -0000	1.5.2.3
@@ -37,7 +37,7 @@
 					<c:param name="toolContentID" value="${sessionMap.toolContentID}" />
 					<c:param name="contentFolderID" value="${sessionMap.contentFolderID}" />
 				</c:url>
-				<a href="#" onclick="javascript:launchPopup('${authoringUrl}','definelater')" class="btn btn-default">
+				<a href="#" onclick="javascript:launchPopup('${authoringUrl}','definelater')" class="btn btn-default pull-right">
 					<fmt:message key="label.monitoring.edit.activity.edit" />
 				</a>
 			</td>
Index: lams_tool_forum/web/jsps/monitoring/editactivity.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/monitoring/editactivity.jsp,v
diff -u -r1.18.2.2 -r1.18.2.3
--- lams_tool_forum/web/jsps/monitoring/editactivity.jsp	27 Mar 2017 17:28:17 -0000	1.18.2.2
+++ lams_tool_forum/web/jsps/monitoring/editactivity.jsp	7 Apr 2017 14:25:44 -0000	1.18.2.3
@@ -34,7 +34,7 @@
 		<c:param name="toolContentID" value="${toolContentID}" />
 		<c:param name="mode" value="teacher" />
 	</c:url>
-	<html:link href="javascript:;" onclick="launchPopup('${authoringUrl}','definelater')" styleClass="btn btn-default">
+	<html:link href="javascript:;" onclick="launchPopup('${authoringUrl}','definelater')" styleClass="btn btn-default pull-right">
 		<fmt:message key="label.monitoring.edit.activity.edit" />
 	</html:link>
 </c:if>
Index: lams_tool_gmap/web/pages/learning/gmap.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_gmap/web/pages/learning/gmap.jsp,v
diff -u -r1.20.2.3 -r1.20.2.4
--- lams_tool_gmap/web/pages/learning/gmap.jsp	16 Sep 2016 01:48:49 -0000	1.20.2.3
+++ lams_tool_gmap/web/pages/learning/gmap.jsp	7 Apr 2017 14:25:37 -0000	1.20.2.4
@@ -1,21 +1,18 @@
 <%@ include file="/common/taglibs.jsp"%>
 <c:set var="tool"><lams:WebAppURL /></c:set>
 <c:set var="lrnForm" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-<script type="text/javascript">
-<!--	
+<script type="text/javascript">	
 	function validateForm() {
 	}
 
 	function disableFinishButton() {
 		document.getElementById("finishButton").disabled = true;
 	}
 	
-	function refreshPage()
-	{
+	function refreshPage() {
 		var url = "<lams:WebAppURL/>/learning.do?mode=${mode}&toolSessionID=${gmapSessionDTO.sessionID}";
 		window.location = url;
 	}
--->
 </script>
 
 <lams:Page type="learner" title="${gmapDTO.title}">
@@ -39,23 +36,25 @@
 			</div>	
 		</div>
 		</div>
-<html:form action="/learning" method="post" styleId="learningForm">		
+		
+	<html:form action="/learning" method="post" styleId="learningForm">		
 		<div class="btn-group-sm">
 			<c:if test="${contentEditable}">
 				<a href="javascript:addMarkerToCenter()" class="btn btn-default voffset5" role="button"/><fmt:message key="button.addMarker"/></a>
 			</c:if>
-				<a href="javascript:fitMapMarkers()" class="btn btn-default voffset5" role="button"/><fmt:message key="button.fitMarkers"/></a>
-				<a href="javascript:if(confirmLeavePage()){refreshPage();}" class="btn btn-default voffset5" role="button"/><fmt:message key="button.refresh"/></a>
-		<div class="btn-group-sm col-md-4 pull-right">
+			
+			<a href="javascript:fitMapMarkers()" class="btn btn-default voffset5" role="button"/><fmt:message key="button.fitMarkers"/></a>
+			<a href="javascript:if(confirmLeavePage()){refreshPage();}" class="btn btn-default voffset5" role="button"/><fmt:message key="button.refresh"/></a>
+			<div class="btn-group-sm col-md-4 pull-right">
 		        &nbsp;&nbsp;&nbsp;
 				<html:hidden property="toolSessionID" styleId="toolSessionID"/>
 		        <html:hidden property="markersXML" value="" styleId="markersXML" />
 		        <html:hidden property="mode" value="${mode}" />	
 				<html:submit styleClass="btn btn-primary voffset5" onclick="javascript:document.getElementById('dispatch').value = 'saveMarkers'; return serialiseMarkers();">
 			           	<fmt:message>button.save</fmt:message>
 		        </html:submit>
+			</div>
 		</div>
-		</div>
 	
 		<div class="voffset5">
 			<input type="text" onkeypress="javascript:if (event.keyCode==13){showAddress();return false;}" size="55" name="address" id="address" value="${gmapDTO.defaultGeocoderAddress}" />
@@ -65,10 +64,8 @@
 	</div>
 	<!-- end map UI -->
 	
-	<c:if test="${mode == 'learner' || mode == 'author'}">
-		<%@ include file="parts/finishButton.jsp"%>
-	</c:if>
+		<c:if test="${mode == 'learner' || mode == 'author'}">
+			<%@ include file="parts/finishButton.jsp"%>
+		</c:if>
 	 </html:form>
 </lams:Page>
-
-
Index: lams_tool_gmap/web/pages/monitoring/editActivity.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_gmap/web/pages/monitoring/editActivity.jsp,v
diff -u -r1.2.2.1 -r1.2.2.2
--- lams_tool_gmap/web/pages/monitoring/editActivity.jsp	13 May 2016 02:39:11 -0000	1.2.2.1
+++ lams_tool_gmap/web/pages/monitoring/editActivity.jsp	7 Apr 2017 14:25:37 -0000	1.2.2.2
@@ -34,7 +34,7 @@
 	<c:param name="mode" value="teacher" />
 	<c:param name="contentFolderID" value="${contentFolderID}" />
 </c:url>
-<html:link href="javascript:;" onclick="launchPopup('${authoringUrl}')" styleClass="btn btn-default">
+<html:link href="javascript:;" onclick="launchPopup('${authoringUrl}')" styleClass="btn btn-default pull-right">
 	<fmt:message key="button.editActivity" />
 </html:link>
 
Index: lams_tool_images/web/pages/monitoring/editactivity.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/web/pages/monitoring/editactivity.jsp,v
diff -u -r1.2.2.1 -r1.2.2.2
--- lams_tool_images/web/pages/monitoring/editactivity.jsp	12 May 2016 09:54:34 -0000	1.2.2.1
+++ lams_tool_images/web/pages/monitoring/editactivity.jsp	7 Apr 2017 14:25:50 -0000	1.2.2.2
@@ -33,7 +33,7 @@
 				<c:param name="toolContentID" value="${sessionMap.toolContentID}" />
 				<c:param name="contentFolderID" value="${sessionMap.contentFolderID}" />
 			</c:url>
-			<html:link href="#nogo" onclick="javascript:launchPopup('${authoringUrl}','definelater');" styleClass="btn btn-default">
+			<html:link href="#nogo" onclick="javascript:launchPopup('${authoringUrl}','definelater');" styleClass="btn btn-default pull-right">
 				<fmt:message key="label.monitoring.edit.activity.edit" />
 			</html:link>
 		</td>
Index: lams_tool_imscc/web/pages/monitoring/editactivity.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/web/pages/monitoring/editactivity.jsp,v
diff -u -r1.2.2.1 -r1.2.2.2
--- lams_tool_imscc/web/pages/monitoring/editactivity.jsp	18 May 2016 17:47:29 -0000	1.2.2.1
+++ lams_tool_imscc/web/pages/monitoring/editactivity.jsp	7 Apr 2017 14:25:55 -0000	1.2.2.2
@@ -35,7 +35,7 @@
 				<c:param name="toolContentID" value="${sessionMap.toolContentID}" />
 				<c:param name="contentFolderID" value="${sessionMap.contentFolderID}" />
 			</c:url>
-			<html:link href="#nogo" onclick="javascript:launchPopup('${authoringUrl}','definelater')" styleClass="btn btn-default">
+			<html:link href="#nogo" onclick="javascript:launchPopup('${authoringUrl}','definelater')" styleClass="btn btn-default pull-right">
 				<fmt:message key="label.monitoring.edit.activity.edit" />
 			</html:link>
 		</td>
Index: lams_tool_kaltura/web/pages/monitoring/editActivity.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_kaltura/web/pages/monitoring/editActivity.jsp,v
diff -u -r1.2.2.2 -r1.2.2.3
--- lams_tool_kaltura/web/pages/monitoring/editActivity.jsp	5 Apr 2017 16:44:25 -0000	1.2.2.2
+++ lams_tool_kaltura/web/pages/monitoring/editActivity.jsp	7 Apr 2017 14:25:49 -0000	1.2.2.3
@@ -32,7 +32,7 @@
 	<c:param name="mode" value="teacher" />
 	<c:param name="contentFolderID" value="${contentFolderID}" />
 </c:url>
-<html:link href="${authoringUrl}" styleClass="btn btn-default pull-right">
+<html:link href="#nogo" onclick="javascript:launchPopup('${authoringUrl}','definelater')" styleClass="btn btn-default pull-right">
 	<fmt:message key="button.editActivity" />
 </html:link>
 
Index: lams_tool_lamc/web/monitoring/Edit.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/monitoring/Edit.jsp,v
diff -u -r1.12.2.2 -r1.12.2.3
--- lams_tool_lamc/web/monitoring/Edit.jsp	24 May 2016 13:45:13 -0000	1.12.2.2
+++ lams_tool_lamc/web/monitoring/Edit.jsp	7 Apr 2017 14:25:40 -0000	1.12.2.3
@@ -40,6 +40,6 @@
 	<c:param name="contentFolderID" value="${formBean.contentFolderID}" />
 	<c:param name="mode" value="teacher" />
 </c:url>
-<html:link href="javascript:;" onclick="launchPopup('${authoringUrl}','definelater')" styleClass="btn btn-default">
+<html:link href="javascript:;" onclick="launchPopup('${authoringUrl}','definelater')" styleClass="btn btn-default pull-right">
 	<fmt:message key="label.edit"/>
 </html:link>				 		  					
Index: lams_tool_laqa/web/monitoring/Edit.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/monitoring/Edit.jsp,v
diff -u -r1.14.2.1 -r1.14.2.2
--- lams_tool_laqa/web/monitoring/Edit.jsp	8 Jun 2016 10:10:41 -0000	1.14.2.1
+++ lams_tool_laqa/web/monitoring/Edit.jsp	7 Apr 2017 14:25:52 -0000	1.14.2.2
@@ -27,6 +27,6 @@
 	<c:param name="toolContentID" value="${formBean.toolContentID}" />
 	<c:param name="contentFolderID" value="${formBean.contentFolderID}" />
 </c:url>
-<html:link href="javascript:;" onclick="launchPopup('${authoringUrl}','definelater')" styleClass="btn btn-default">
+<html:link href="javascript:;" onclick="launchPopup('${authoringUrl}','definelater')" styleClass="btn btn-default pull-right">
 	<fmt:message key="label.edit" />
 </html:link>
\ No newline at end of file
Index: lams_tool_larsrc/web/pages/monitoring/editactivity.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/monitoring/editactivity.jsp,v
diff -u -r1.10.2.1 -r1.10.2.2
--- lams_tool_larsrc/web/pages/monitoring/editactivity.jsp	20 May 2016 10:36:08 -0000	1.10.2.1
+++ lams_tool_larsrc/web/pages/monitoring/editactivity.jsp	7 Apr 2017 14:25:33 -0000	1.10.2.2
@@ -33,7 +33,7 @@
 				<c:param name="toolContentID" value="${sessionMap.toolContentID}" />
 				<c:param name="contentFolderID" value="${sessionMap.contentFolderID}" />
 			</c:url>
-			<html:link href="javascript:;" onclick="launchPopup('${authoringUrl}','definelater')" styleClass="btn btn-default">
+			<html:link href="javascript:;" onclick="launchPopup('${authoringUrl}','definelater')" styleClass="btn btn-default pull-right">
 				<fmt:message key="label.monitoring.edit.activity.edit" />
 			</html:link>
 		</td>
Index: lams_tool_leader/web/pages/monitoring/editActivity.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_leader/web/pages/monitoring/editActivity.jsp,v
diff -u -r1.3.2.2 -r1.3.2.3
--- lams_tool_leader/web/pages/monitoring/editActivity.jsp	5 Apr 2017 16:44:17 -0000	1.3.2.2
+++ lams_tool_leader/web/pages/monitoring/editActivity.jsp	7 Apr 2017 14:25:56 -0000	1.3.2.3
@@ -35,7 +35,7 @@
 		<c:param name="mode" value="teacher" />
 		<c:param name="contentFolderID" value="${contentFolderID}" />
 	</c:url>
-	<html:link href="${authoringUrl}" styleClass="btn btn-default">
+	<html:link href="#nogo" onclick="javascript:launchPopup('${authoringUrl}','definelater')" styleClass="btn btn-default pull-right">
 		<fmt:message key="button.editActivity" />
 	</html:link>
 </p>
Index: lams_tool_mindmap/web/pages/monitoring/editActivity.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_mindmap/web/pages/monitoring/editActivity.jsp,v
diff -u -r1.5.2.2 -r1.5.2.3
--- lams_tool_mindmap/web/pages/monitoring/editActivity.jsp	5 Apr 2017 16:44:24 -0000	1.5.2.2
+++ lams_tool_mindmap/web/pages/monitoring/editActivity.jsp	7 Apr 2017 14:25:47 -0000	1.5.2.3
@@ -36,7 +36,7 @@
 	</c:url>
 	
 	<c:if test="${dto.contentInUse == false}">
-		<html:link href="${authoringUrl}" styleClass="btn btn-default">
+		<html:link href="#nogo" onclick="javascript:launchPopup('${authoringUrl}','definelater')" styleClass="btn btn-default pull-right">
 			<fmt:message key="button.editActivity" />
 		</html:link>
 	</c:if>
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringAction.java,v
diff -u -r1.32.2.5 -r1.32.2.6
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringAction.java	4 Apr 2017 11:57:47 -0000	1.32.2.5
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringAction.java	7 Apr 2017 14:26:01 -0000	1.32.2.6
@@ -65,10 +65,6 @@
 
     public final static String FORM = "NbMonitoringForm";
 
-    public static final String SUMMARY_TABID = "1";
-    public static final String EDITACTIVITY_TABID = "2";
-    public static final String STATISTICS_TABID = "3";
-
     @Override
     public ActionForward unspecified(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) throws NbApplicationException {
@@ -88,13 +84,8 @@
 	monitorForm.setTitle(content.getTitle());
 	monitorForm.setBasicContent(content.getContent());
 
-	monitorForm.setContentEditable("true");
-	//set up the request parameters to append to the URL
-	Map<String, Object> mapParameters = new HashMap<String, Object>();
-	mapParameters.put(NoticeboardConstants.TOOL_CONTENT_ID, toolContentId.toString());
-	mapParameters.put(NoticeboardConstants.DEFINE_LATER, "true");
-	mapParameters.put(NoticeboardConstants.CONTENT_FOLDER_ID, contentFolderID);
-	monitorForm.setParametersToAppend(mapParameters);
+	request.setAttribute(NoticeboardConstants.TOOL_CONTENT_ID, toolContentId);
+	request.setAttribute(NoticeboardConstants.CONTENT_FOLDER_ID, contentFolderID);
 
 	//Get the total number of learners that have participated in this tool activity
 	monitorForm.setTotalLearners(nbService.calculateTotalNumberOfUsers(toolContentId));
@@ -141,7 +132,7 @@
 	request.setAttribute("allowComments", content.isAllowComments());
 
 	String currentTab = WebUtil.readStrParam(request, AttributeNames.PARAM_CURRENT_TAB, true);
-	monitorForm.setCurrentTab(currentTab != null ? currentTab : SUMMARY_TABID);
+	monitorForm.setCurrentTab(currentTab != null ? currentTab : "1");
 	request.setAttribute(FORM, monitorForm);
 	return mapping.findForward(NoticeboardConstants.MONITOR_PAGE);
     }
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringForm.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringForm.java,v
diff -u -r1.14.2.4 -r1.14.2.5
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringForm.java	11 May 2016 07:37:11 -0000	1.14.2.4
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringForm.java	7 Apr 2017 14:26:01 -0000	1.14.2.5
@@ -34,20 +34,7 @@
 
 /**
  * @author mtruong
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
-
-/**
- * Creation Date: 12-07-05
- * 
- *
- *
- *
- *
- *
- */
 public class NbMonitoringForm extends ActionForm {
 
     private static final long serialVersionUID = 6958826482877304278L;
@@ -58,34 +45,16 @@
 
     private String method;
 
-    private Map parametersToAppend;
-
     private String currentTab;
 
     /* Only valid when form just set up by Java. Values are not returned from jsp page */
     private String title;
     private String basicContent;
-    private String contentEditable;
     private Integer totalLearners;
     private Map groupStatsMap;
     private Map sessionIdMap;
 
     /**
-     * @return Returns the parametersToAppend.
-     */
-    public Map getParametersToAppend() {
-	return parametersToAppend;
-    }
-
-    /**
-     * @param parametersToAppend
-     *            The parametersToAppend to set.
-     */
-    public void setParametersToAppend(Map parametersToAppend) {
-	this.parametersToAppend = parametersToAppend;
-    }
-
-    /**
      * @return Returns the method.
      */
     public String getMethod() {
@@ -118,7 +87,6 @@
     @Override
     public void reset(ActionMapping mapping, HttpServletRequest request) {
 	this.method = null;
-	this.parametersToAppend = null;
 
     }
 
@@ -138,18 +106,10 @@
 	return title;
     }
 
-    public String getContentEditable() {
-	return contentEditable;
-    }
-
     public void setBasicContent(String basicContent) {
 	this.basicContent = basicContent;
     }
 
-    public void setContentEditable(String contentEditable) {
-	this.contentEditable = contentEditable;
-    }
-
     public void setTitle(String title) {
 	this.title = title;
     }
Index: lams_tool_nb/web/WEB-INF/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/web/WEB-INF/Attic/struts-config.xml,v
diff -u -r1.25.2.2 -r1.25.2.3
--- lams_tool_nb/web/WEB-INF/struts-config.xml	27 Apr 2016 13:22:50 -0000	1.25.2.2
+++ lams_tool_nb/web/WEB-INF/struts-config.xml	7 Apr 2017 14:26:01 -0000	1.25.2.3
@@ -46,12 +46,6 @@
     type="java.lang.Exception"/>
 </global-exceptions>
 
-  <!-- ========== Global Forward Definitions =================================== -->
-  <global-forwards>
- 	<forward name="forwardToAuthorPage"
-          path="/authoring.do"/>
- </global-forwards> 
-
   <!-- ========== Action Mapping Definitions =================================== -->
    <action-mappings>
     <action
Index: lams_tool_nb/web/monitoring/m_EditActivity.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/web/monitoring/m_EditActivity.jsp,v
diff -u -r1.7.2.2 -r1.7.2.3
--- lams_tool_nb/web/monitoring/m_EditActivity.jsp	5 Apr 2017 16:44:19 -0000	1.7.2.2
+++ lams_tool_nb/web/monitoring/m_EditActivity.jsp	7 Apr 2017 14:26:01 -0000	1.7.2.3
@@ -9,26 +9,31 @@
 </c:if>
 
 <table class="table table-condensed">
-			<tr>
-				<td class="field-name">
-					<fmt:message key="basic.title" />
-				</td>
-				<td>
-					<c:out value="${formBean.title}" escapeXml="true" />
-				</td>
-			</tr>
-			<tr>
-				<td class="field-name">
-					<fmt:message key="basic.content" />
-				</td>
-				<td>
-					<c:out value="${formBean.basicContent}" escapeXml="false" />
-				</td>
-			</tr>
+	<tr>
+		<td class="field-name">
+			<fmt:message key="basic.title" />
+		</td>
+		<td>
+			<c:out value="${formBean.title}" escapeXml="true" />
+		</td>
+	</tr>
+	<tr>
+		<td class="field-name">
+			<fmt:message key="basic.content" />
+		</td>
+		<td>
+			<c:out value="${formBean.basicContent}" escapeXml="false" />
+		</td>
+	</tr>
 </table>
 
 <p class="align-right">
-	<html:link forward="forwardToAuthorPage" name="NbMonitoringForm" property="parametersToAppend" styleClass="btn btn-default">
+	<c:url value="/authoring.do" var="authoringUrl">
+		<c:param name="toolContentID" value="${toolContentID}" />
+		<c:param name="defineLater" value="true" />
+		<c:param name="contentFolderID" value="${contentFolderID}" />
+	</c:url>
+	<html:link href="#nogo" onclick="javascript:launchPopup('${authoringUrl}','definelater')" styleClass="btn btn-default pull-right">
 		<fmt:message key="button.edit" />
 	</html:link>
 </p>
Index: lams_tool_nb/web/monitoring/m_Summary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/web/monitoring/m_Summary.jsp,v
diff -u -r1.9.2.3 -r1.9.2.4
--- lams_tool_nb/web/monitoring/m_Summary.jsp	22 Apr 2016 00:32:33 -0000	1.9.2.3
+++ lams_tool_nb/web/monitoring/m_Summary.jsp	7 Apr 2017 14:26:01 -0000	1.9.2.4
@@ -1,17 +1,17 @@
 <%@ include file="/includes/taglibs.jsp"%>
 <script type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/monitorToolSummaryAdvanced.js" ></script>
 	
-	<div class="panel">
+<div class="panel">
 	<h4><c:out value="${formBean.title}" escapeXml="true" /></h4>
 	<div class="voffset5"><c:out value="${formBean.basicContent}" escapeXml="false" /></div>
-	</div>
+</div>
 
-	<H4><fmt:message key="titleHeading.statistics"/></H2>
-	<%@ include file="m_Statistics.jsp"%>
+<H4><fmt:message key="titleHeading.statistics"/></H2>
+<%@ include file="m_Statistics.jsp"%>
 
-	<c:if test="${reflectOnActivity}" >
-		<H4><fmt:message key="titleHeading.reflections"/></H4>
-		<table class="table table-striped">
+<c:if test="${reflectOnActivity}" >
+	<H4><fmt:message key="titleHeading.reflections"/></H4>
+	<table class="table table-striped">
 		<c:forEach var="reflection" items="${reflections}">
 			<logic:empty name="reflections">
 				<tr>
@@ -36,9 +36,8 @@
 				</td>
 			</tr>
 		</c:forEach>
-		</table>
-		
-	</c:if>
+	</table>	
+</c:if>
 	
 <c:set var="adTitle"><fmt:message key="monitor.summary.th.advancedSettings" /></c:set>
 <lams:AdvancedAccordian title="${adTitle}">
Index: lams_tool_notebook/web/pages/monitoring/editActivity.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/pages/monitoring/editActivity.jsp,v
diff -u -r1.6.2.1 -r1.6.2.2
--- lams_tool_notebook/web/pages/monitoring/editActivity.jsp	18 May 2016 10:29:29 -0000	1.6.2.1
+++ lams_tool_notebook/web/pages/monitoring/editActivity.jsp	7 Apr 2017 14:25:30 -0000	1.6.2.2
@@ -34,7 +34,7 @@
 		<c:param name="mode" value="teacher" />
 		<c:param name="contentFolderID" value="${contentFolderID}" />
 	</c:url>
-	<html:link href="javascript:;" onclick="launchPopup('${authoringUrl}','definelater')" styleClass="btn btn-default">
+	<html:link href="javascript:;" onclick="launchPopup('${authoringUrl}','definelater')" styleClass="btn btn-default pull-right">
 		<fmt:message key="button.editActivity" />
 	</html:link>
 </c:if>
Index: lams_tool_pixlr/web/pages/monitoring/editActivity.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_pixlr/web/pages/monitoring/editActivity.jsp,v
diff -u -r1.2.2.2 -r1.2.2.3
--- lams_tool_pixlr/web/pages/monitoring/editActivity.jsp	5 Apr 2017 16:44:14 -0000	1.2.2.2
+++ lams_tool_pixlr/web/pages/monitoring/editActivity.jsp	7 Apr 2017 14:25:38 -0000	1.2.2.3
@@ -33,7 +33,7 @@
 	<c:param name="mode" value="teacher" />
 	<c:param name="contentFolderID" value="${contentFolderID}" />
 </c:url>
-<html:link href="${authoringUrl}" styleClass="btn btn-default pull-right">
+<html:link href="#nogo" onclick="javascript:launchPopup('${authoringUrl}','definelater')" styleClass="btn btn-default pull-right">
 	<fmt:message key="button.editActivity" />
 </html:link>
 
Index: lams_tool_preview/web/pages/monitoring/editactivity.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_preview/web/pages/monitoring/editactivity.jsp,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_tool_preview/web/pages/monitoring/editactivity.jsp	17 May 2016 04:37:37 -0000	1.1.2.1
+++ lams_tool_preview/web/pages/monitoring/editactivity.jsp	7 Apr 2017 14:25:58 -0000	1.1.2.2
@@ -34,7 +34,7 @@
 				<c:param name="toolContentID" value="${sessionMap.toolContentID}" />
 				<c:param name="contentFolderID" value="${sessionMap.contentFolderID}" />
 			</c:url>
-			<html:link href="javascript:;" onclick="launchPopup('${authoringUrl}','definelater')" styleClass="btn btn-default">
+			<html:link href="javascript:;" onclick="launchPopup('${authoringUrl}','definelater')" styleClass="btn btn-default pull-right">
 				<fmt:message key="label.monitoring.edit.activity.edit" />
 			</html:link>
 		</td>
Index: lams_tool_sbmt/web/monitoring/parts/activity.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/monitoring/parts/activity.jsp,v
diff -u -r1.7.2.1 -r1.7.2.2
--- lams_tool_sbmt/web/monitoring/parts/activity.jsp	20 May 2016 12:29:11 -0000	1.7.2.1
+++ lams_tool_sbmt/web/monitoring/parts/activity.jsp	7 Apr 2017 14:25:53 -0000	1.7.2.2
@@ -35,7 +35,7 @@
 		<c:param name="contentFolderID" value="${contentFolderID}" />
 		<c:param name="toolContentID" value="${toolContentID}" />
 	</c:url>
-	<html:link href="javascript:;" onclick="launchPopup('${authoringUrl}','definelater')" styleClass="btn btn-default">
+	<html:link href="javascript:;" onclick="launchPopup('${authoringUrl}','definelater')" styleClass="btn btn-default pull-right">
 		<fmt:message key="label.monitoring.edit.activity.edit" />
 	</html:link>
 </c:if>
\ No newline at end of file
Index: lams_tool_scratchie/web/pages/monitoring/editactivity.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/web/pages/monitoring/editactivity.jsp,v
diff -u -r1.5.2.1 -r1.5.2.2
--- lams_tool_scratchie/web/pages/monitoring/editactivity.jsp	1 Jun 2016 04:21:36 -0000	1.5.2.1
+++ lams_tool_scratchie/web/pages/monitoring/editactivity.jsp	7 Apr 2017 14:25:22 -0000	1.5.2.2
@@ -28,6 +28,6 @@
 	<c:param name="toolContentID" value="${sessionMap.toolContentID}" />
 	<c:param name="contentFolderID" value="${sessionMap.contentFolderID}" />
 </c:url>
-<html:link href="javascript:;" onclick="launchPopup('${authoringUrl}','definelater')" styleClass="btn btn-default">
+<html:link href="javascript:;" onclick="launchPopup('${authoringUrl}','definelater')" styleClass="btn btn-default pull-right">
 	<fmt:message key="label.monitoring.edit.activity.edit" />
 </html:link>
Index: lams_tool_scribe/web/pages/monitoring/editActivity.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/web/pages/monitoring/editActivity.jsp,v
diff -u -r1.5.2.2 -r1.5.2.3
--- lams_tool_scribe/web/pages/monitoring/editActivity.jsp	5 Apr 2017 16:44:21 -0000	1.5.2.2
+++ lams_tool_scribe/web/pages/monitoring/editActivity.jsp	7 Apr 2017 14:25:28 -0000	1.5.2.3
@@ -35,7 +35,7 @@
 		<c:param name="mode" value="teacher" />
 		<c:param name="contentFolderID" value="${contentFolderID}"></c:param>
 	</c:url>
-	<html:link href="${fn:escapeXml(authoringUrl)}" styleClass="btn btn-default">
+	<html:link href="#nogo" onclick="javascript:launchPopup('${fn:escapeXml(authoringUrl)}','definelater')" styleClass="btn btn-default pull-right">
 		<fmt:message key="button.editActivity" />
 	</html:link>
 </c:if>
Index: lams_tool_spreadsheet/web/pages/monitoring/editactivity.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/web/pages/monitoring/editactivity.jsp,v
diff -u -r1.2.2.1 -r1.2.2.2
--- lams_tool_spreadsheet/web/pages/monitoring/editactivity.jsp	12 May 2016 00:48:05 -0000	1.2.2.1
+++ lams_tool_spreadsheet/web/pages/monitoring/editactivity.jsp	7 Apr 2017 14:25:32 -0000	1.2.2.2
@@ -34,7 +34,7 @@
 	<c:param name="toolContentID" value="${sessionMap.toolContentID}" />
 	<c:param name="contentFolderID" value="${sessionMap.contentFolderID}" />
 </c:url>
-<html:link href="javascript:;" onclick="launchPopup('${authoringUrl}','definelater')" styleClass="btn btn-default">
+<html:link href="javascript:;" onclick="launchPopup('${authoringUrl}','definelater')" styleClass="btn btn-default pull-right">
 	<fmt:message key="label.monitoring.edit.activity.edit" />
 </html:link>
  
\ No newline at end of file
Index: lams_tool_survey/web/pages/monitoring/editactivity.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/web/pages/monitoring/editactivity.jsp,v
diff -u -r1.5.2.1 -r1.5.2.2
--- lams_tool_survey/web/pages/monitoring/editactivity.jsp	4 Jun 2016 10:23:43 -0000	1.5.2.1
+++ lams_tool_survey/web/pages/monitoring/editactivity.jsp	7 Apr 2017 14:26:05 -0000	1.5.2.2
@@ -37,7 +37,7 @@
 		<c:param name="toolContentID" value="${sessionMap.toolContentID}" />
 		<c:param name="contentFolderID" value="${sessionMap.contentFolderID}" />
 	</c:url>
-	<html:link href="javascript:;" onclick="launchPopup('${authoringUrl}','definelater')" styleClass="btn btn-default">
+	<html:link href="javascript:;" onclick="launchPopup('${authoringUrl}','definelater')" styleClass="btn btn-default pull-right">
 		<fmt:message key="label.monitoring.edit.activity.edit" />
 	</html:link>
 </c:if>
Index: lams_tool_task/web/pages/monitoring/editactivity.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_task/web/pages/monitoring/editactivity.jsp,v
diff -u -r1.3.2.1 -r1.3.2.2
--- lams_tool_task/web/pages/monitoring/editactivity.jsp	3 Jun 2016 00:18:10 -0000	1.3.2.1
+++ lams_tool_task/web/pages/monitoring/editactivity.jsp	7 Apr 2017 14:26:06 -0000	1.3.2.2
@@ -34,6 +34,6 @@
 	<c:param name="toolContentID" value="${sessionMap.toolContentID}" />
 	<c:param name="contentFolderID" value="${sessionMap.contentFolderID}" />
 </c:url>
-<html:link href="javascript:;" onclick="launchPopup('${authoringUrl}','definelater')" styleClass="btn btn-default">
+<html:link href="javascript:;" onclick="launchPopup('${authoringUrl}','definelater')" styleClass="btn btn-default pull-right">
 	<fmt:message key="label.monitoring.edit.activity.edit" />
 </html:link>
Index: lams_tool_vote/web/monitoring/Edit.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/monitoring/Edit.jsp,v
diff -u -r1.10.2.3 -r1.10.2.4
--- lams_tool_vote/web/monitoring/Edit.jsp	5 Oct 2016 02:48:46 -0000	1.10.2.3
+++ lams_tool_vote/web/monitoring/Edit.jsp	7 Apr 2017 14:25:42 -0000	1.10.2.4
@@ -12,16 +12,16 @@
 		<td><c:out value="${voteGeneralAuthoringDTO.activityInstructions}" escapeXml="false"/></td>
 	</tr>
 	
-<c:forEach items="${listQuestionDTO}" var="currentDTO" varStatus="status">
-	<tr>
-		<td>
-			<fmt:message key="label.nomination" />:
-		</td>
-		<td>
-			<c:out value="${currentDTO.question}" escapeXml="false"/> 
-		</td>
-	</tr>
-</c:forEach>
+	<c:forEach items="${listQuestionDTO}" var="currentDTO" varStatus="status">
+		<tr>
+			<td>
+				<fmt:message key="label.nomination" />:
+			</td>
+			<td>
+				<c:out value="${currentDTO.question}" escapeXml="false"/> 
+			</td>
+		</tr>
+	</c:forEach>
 
 </table>
 
@@ -30,6 +30,6 @@
 	<c:param name="contentFolderID" value="${formBean.contentFolderID}" />
 	<c:param name="mode" value="teacher" />
 </c:url>
-<html:link href="javascript:;" onclick="launchPopup('${authoringUrl}','definelater')" styleClass="btn btn-default">
+<html:link href="javascript:;" onclick="launchPopup('${authoringUrl}','definelater')" styleClass="btn btn-default pull-right">
 	<fmt:message key="label.edit"/>
 </html:link> 
Index: lams_tool_wiki/web/pages/monitoring/editActivity.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wiki/web/pages/monitoring/editActivity.jsp,v
diff -u -r1.2.2.2 -r1.2.2.3
--- lams_tool_wiki/web/pages/monitoring/editActivity.jsp	5 Apr 2017 16:44:22 -0000	1.2.2.2
+++ lams_tool_wiki/web/pages/monitoring/editActivity.jsp	7 Apr 2017 14:26:03 -0000	1.2.2.3
@@ -34,7 +34,7 @@
 	<c:param name="mode" value="teacher" />
 	<c:param name="contentFolderID" value="${contentFolderID}" />
 </c:url>
-<html:link href="${authoringUrl}" styleClass="btn btn-default">
+<html:link href="#nogo" onclick="javascript:launchPopup('${authoringUrl}','definelater')" styleClass="btn btn-default pull-right">
 	<fmt:message key="button.editActivity" />
 </html:link>