Index: lams_tool_nb/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r2b3d7902eba19ec19df28ddfdab299f6a794d15b -r0a9205737ad38f2cde57c92fbee07f8d895aaf44
--- lams_tool_nb/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 2b3d7902eba19ec19df28ddfdab299f6a794d15b)
+++ lams_tool_nb/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 0a9205737ad38f2cde57c92fbee07f8d895aaf44)
@@ -44,6 +44,7 @@
 <%@ attribute name="cancelButtonLabelKey" required="false" rtexprvalue="true" %>
 <%@ attribute name="saveButtonLabelKey" required="false" rtexprvalue="true" %>
 <%@ attribute name="cancelConfirmMsgKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="defineLater" required="false" rtexprvalue="true" %>
 
 <%-- Default value for message key --%>
 <c:if test="${empty cancelButtonLabelKey}">
@@ -62,22 +63,22 @@
 <!-- begin tab content -->
 <script type="text/javascript">
 	if(<c:choose><c:when test="${LAMS_AUTHORING_SUCCESS_FLAG == true}">true</c:when><c:otherwise>false</c:otherwise></c:choose>){
-        	location.href="<c:url value='${clearSessionActionUrl}?action=confirm&mode=${accessMode}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+       	location.href="<c:url value='${clearSessionActionUrl}?action=confirm&mode=${accessMode}&signature=${toolSignature}&toolContentID=${toolContentID}&defineLater=${defineLater}'/>";
+	}
+    function doSubmit_Form_Only() {
+    	document.getElementById("${formID}").submit();
+    }
+    function doCancel() {
+    	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
+        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}'/>";
+        	//just for depress alert window when call window.close()
+        	//only available for IE browser
+        	var userAgent=navigator.userAgent;
+        	if(userAgent.indexOf('MSIE') != -1)
+	        	window.opener = "authoring"
+        	window.close();
 		}
-        function doSubmit_Form_Only() {
-        	document.getElementById("${formID}").submit();
-        }
-        function doCancel() {
-        	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
-	        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}'/>";
-	        	//just for depress alert window when call window.close()
-	        	//only available for IE browser
-	        	var userAgent=navigator.userAgent;
-	        	if(userAgent.indexOf('MSIE') != -1)
-		        	window.opener = "authoring"
-	        	window.close();
-			}
-        }  				
+    }  				
 </script>				
 <p align="right">
 	<html:link href="javascript:doSubmit_Form_Only();" property="submit" styleClass="button">
Index: lams_tool_nb/web/WEB-INF/tags/HTMLEditor.tag
===================================================================
diff -u -r65166da92a6f0f4ff73acb92b95672e237b25742 -r0a9205737ad38f2cde57c92fbee07f8d895aaf44
--- lams_tool_nb/web/WEB-INF/tags/HTMLEditor.tag	(.../HTMLEditor.tag)	(revision 65166da92a6f0f4ff73acb92b95672e237b25742)
+++ lams_tool_nb/web/WEB-INF/tags/HTMLEditor.tag	(.../HTMLEditor.tag)	(revision 0a9205737ad38f2cde57c92fbee07f8d895aaf44)
@@ -1,58 +1,58 @@
-<% 
-/****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- * =============================================================
- * License Information: http://lamsfoundation.org/licensing/lams/2.0/
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2.0
- * as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
- * USA
- * 
- * http://www.gnu.org/licenses/gpl.txt
- * ****************************************************************
- */
- 
- /**
-  * HTMLEditor.tag
-  *	Author: Mitchell Seaton
-  *	Description: Creates a single instance of FCK Editor used over multiple fields.
-  * Wiki: 
-  */
- 
- %>
-<%@ tag body-content="empty" %>
-<%@ taglib uri="fck-editor" prefix="FCK" %>
-<%@ taglib uri="tags-bean" prefix="bean" %>
-<%@ taglib uri="tags-core" prefix="c" %>
-<%@ taglib uri="tags-lams" prefix="lams" %>
-<c:set var="lams"><lams:LAMSURL/></c:set>
+<%/****************************************************************
+			 * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+			 * =============================================================
+			 * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+			 * 
+			 * This program is free software; you can redistribute it and/or modify
+			 * it under the terms of the GNU General Public License version 2.0
+			 * as published by the Free Software Foundation.
+			 * 
+			 * This program is distributed in the hope that it will be useful,
+			 * but WITHOUT ANY WARRANTY; without even the implied warranty of
+			 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+			 * GNU General Public License for more details.
+			 * 
+			 * You should have received a copy of the GNU General Public License
+			 * along with this program; if not, write to the Free Software
+			 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+			 * USA
+			 * 
+			 * http://www.gnu.org/licenses/gpl.txt
+			 * ****************************************************************
+			 */
 
-<div id="wyswygEditorScreen" style="visibility: hidden"> <!-- position: absolute; z-index: 1000; top: 16px; left: 230px; -->
-        <div id="wyswygEditor">
-            <div>
-               <FCK:editor id="FCKeditor1" basePath="/lams/fckeditor/"
-                    imageBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector"
-                    linkBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector"
-                    flashBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector"
-                    imageUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Image"
-                    linkUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=File"
-                    flashUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Flash">
-         		</FCK:editor>  
-            </div>
-            <div style="text-align: center">
-                <a href="#" onClick="saveWYSWYGEdittedText(activeEditorIndex); doPreview(activeEditorIndex)" ><img src="${lams}images/tick.gif" border="0" alt="<bean:message key="label.save"/>"/></a>
-                &nbsp&nbsp&nbsp&nbsp
-                <a href="#" onClick="doPreview(activeEditorIndex)"><img src="${lams}images/cross.gif" border="0" alt="<bean:message key="label.cancel"/>"/></a>
-            </div>
-        </div>
+			/**
+			 * HTMLEditor.tag
+			 *	Author: Mitchell Seaton
+			 *	Description: Creates a single instance of FCK Editor used over multiple fields.
+			 * Wiki: 
+			 */
+
+		%>
+<%@ tag body-content="empty"%>
+<%@ taglib uri="fck-editor" prefix="FCK"%>
+<%@ taglib uri="tags-bean" prefix="bean"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<c:set var="lams">
+	<lams:LAMSURL />
+</c:set>
+
+<div id="wyswygEditorScreen" style="visibility: hidden">
+	<!-- position: absolute; z-index: 1000; top: 16px; left: 230px; -->
+	<!--  Testing by Anthony, please delete this comment -->
+	<div id="wyswygEditor">
+		<div>
+			<FCK:editor id="FCKeditor1" basePath="/lams/fckeditor/" imageBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Image&amp;Connector=connectors/jsp/connector" 
+				linkBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector" 
+				flashBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Flash&amp;Connector=connectors/jsp/connector" 
+				imageUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Image" linkUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=File" 
+				flashUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Flash">
+			</FCK:editor>
+		</div>
+		<div style="text-align: center">
+			<a href="#" onClick="saveWYSWYGEdittedText(activeEditorIndex); doPreview(activeEditorIndex)"><img src="${lams}images/tick.gif" border="0" alt="<bean:message key="label.save"/>" /></a> &nbsp;&nbsp;&nbsp;&nbsp; <a href="#"
+				onClick="doPreview(activeEditorIndex)"><img src="${lams}images/cross.gif" border="0" alt="<bean:message key="label.cancel"/>" /></a>
+		</div>
+	</div>
 </div>
Index: lams_tool_nb/web/WEB-INF/tags/SetEditor.tag
===================================================================
diff -u -r65166da92a6f0f4ff73acb92b95672e237b25742 -r0a9205737ad38f2cde57c92fbee07f8d895aaf44
--- lams_tool_nb/web/WEB-INF/tags/SetEditor.tag	(.../SetEditor.tag)	(revision 65166da92a6f0f4ff73acb92b95672e237b25742)
+++ lams_tool_nb/web/WEB-INF/tags/SetEditor.tag	(.../SetEditor.tag)	(revision 0a9205737ad38f2cde57c92fbee07f8d895aaf44)
@@ -1,64 +1,90 @@
-<% 
-/****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- * =============================================================
- * License Information: http://lamsfoundation.org/licensing/lams/2.0/
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2.0
- * as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
- * USA
- * 
- * http://www.gnu.org/licenses/gpl.txt
- * ****************************************************************
- */
- 
- /**
-  * SetEditor.tag
-  *	Author: Mitchell Seaton
-  *	Description: Creates a dynamic textarea field using a HTML Editor.
-  * Wiki: 
-  */
- 
- %>
-<%@ tag body-content="empty" %>
-<%@ attribute name="id" required="true" rtexprvalue="true" %>
-<%@ attribute name="text" required="true" rtexprvalue="true" %>
-<%@ attribute name="small" required="false" rtexprvalue="true" %>
-<%@ taglib uri="tags-function" prefix="fn" %>
-<%@ taglib uri="tags-core" prefix="c" %>
-<%@ taglib uri="tags-lams" prefix="lams" %>
+<%/****************************************************************
+			 * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+			 * =============================================================
+			 * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+			 * 
+			 * This program is free software; you can redistribute it and/or modify
+			 * it under the terms of the GNU General Public License version 2.0
+			 * as published by the Free Software Foundation.
+			 * 
+			 * This program is distributed in the hope that it will be useful,
+			 * but WITHOUT ANY WARRANTY; without even the implied warranty of
+			 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+			 * GNU General Public License for more details.
+			 * 
+			 * You should have received a copy of the GNU General Public License
+			 * along with this program; if not, write to the Free Software
+			 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+			 * USA
+			 * 
+			 * http://www.gnu.org/licenses/gpl.txt
+			 * ****************************************************************
+			 */
 
-<c:set var="lams"><lams:LAMSURL/></c:set>
-<c:set var="tool"><lams:WebAppURL/></c:set>
+			/**
+			 * SetEditor.tag
+			 *	Author: Mitchell Seaton
+			 *	Description: Creates a dynamic textarea field using a HTML Editor.
+			 * Wiki: 
+			 */
 
-<c:set var="previewClassName" value="previewPanel"/>
-<c:set var="txtClassName" value="textareaPanel"/>
-<c:set var="id_a" value="${fn:substring(id, 0, 1)}"/>
-<c:set var="id_b" value="${fn:substring(id, 1, fn:length(id))}"/>
+		%>
+<%@ tag body-content="empty"%>
+<%@ attribute name="id" required="true" rtexprvalue="true"%>
+<%@ attribute name="text" required="true" rtexprvalue="true"%>
+<%@ attribute name="small" required="false" rtexprvalue="true"%>
+<%@ attribute name="key" required="false" rtexprvalue="true"%>
+<%@ attribute name="alt" required="false" rtexprvalue="true"%> <!--  default true -->
 
-	<c:if test="${small}">
-		<c:set var="previewClassName" value="smallPreviewPanel"/>
-		<c:set var="txtClassName" value="smallTextareaPanel"/>
-	</c:if>
-	<span id="preview${id}" style="visibility: hidden; display: none;">
-		<div>
-	    	<a href="javascript:doWYSWYGEdit('${id}'<c:if test="${small}">,'small'</c:if>)"><img src="${lams}images/html.gif" border="0" alt="Open HTML Editor"></a>
-	    </div>
-	    <div class="${previewClassName}" id="preview${id}.text"></div>
-	</span>
-	<span id="tx${id}">
-		<div>
-	    	<a href="javascript:doTextToHTML('${id}'); doWYSWYGEdit('${id}'<c:if test="${small}">,'small'</c:if>)"><img src="${lams}images/html.gif" border="0" alt="Open HTML Editor"></a>
-	    </div>
-		<textarea class="${txtClassName}" name="${fn:toLowerCase(id_a)}${id_b}" id="tx${id}.textarea"><c:out value="${text}" escapeXml="false" /></textarea>
-	</span>
\ No newline at end of file
+<%@ taglib uri="tags-function" prefix="fn"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+
+<c:set var="lams">
+	<lams:LAMSURL />
+</c:set>
+<c:set var="tool">
+	<lams:WebAppURL />
+</c:set>
+
+<c:set var="previewClassName" value="previewPanel" />
+<c:set var="txtClassName" value="textareaPanel" />
+<c:set var="id_a" value="${fn:substring(id, 0, 1)}" />
+<c:set var="id_b" value="${fn:substring(id, 1, fn:length(id))}" />
+
+<c:if test="${small}">
+	<c:set var="previewClassName" value="smallPreviewPanel" />
+	<c:set var="txtClassName" value="smallTextareaPanel" />
+</c:if>
+
+<c:set var="fieldName" value="field-name" />
+<c:if test="${alt}">
+<c:set var="fieldName" value="field-name-alternative-color" />
+</c:if>
+
+<div id="preview${id}" style="visibility: hidden; display: none;">
+	<div>
+		<p class="button">
+			<c:if test="${key != null}">
+				<span class="${fieldName}"><fmt:message key="${key}" /></span>
+			</c:if>
+			<a href="javascript:doWYSWYGEdit('${id}'<c:if test="${small}">,'small'</c:if>)" class="button-html-editor">HTML Editor</a>
+		</p>
+	</div>
+	<div class="${previewClassName}" id="preview${id}.text"></div>
+</div>
+
+
+<div id="tx${id}">
+	<div>
+
+		<p class="button">
+			<c:if test="${key != null}">
+				<span class="${fieldName}"><fmt:message key="${key}" /></span>
+			</c:if>
+			<a href="javascript:doTextToHTML('${id}');doWYSWYGEdit('${id}'<c:if test="${small}">,'small'</c:if>)" class="button-html-editor">HTML Editor</a>
+		</p>
+	</div>
+	<textarea class="${txtClassName}" name="${fn:toLowerCase(id_a)}${id_b}" id="tx${id}.textarea"><c:out value="${text}" escapeXml="false" /></textarea>
+</div>
Index: lams_tool_nb/web/WEB-INF/tags/Tab.tag
===================================================================
diff -u -r65166da92a6f0f4ff73acb92b95672e237b25742 -r0a9205737ad38f2cde57c92fbee07f8d895aaf44
--- lams_tool_nb/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision 65166da92a6f0f4ff73acb92b95672e237b25742)
+++ lams_tool_nb/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision 0a9205737ad38f2cde57c92fbee07f8d895aaf44)
@@ -1,79 +1,99 @@
-<% 
-/****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- * =============================================================
- * License Information: http://lamsfoundation.org/licensing/lams/2.0/
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2.0
- * as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
- * USA
- * 
- * http://www.gnu.org/licenses/gpl.txt
- * ****************************************************************
- */
- 
- /**
-  * Tab.tag
-  *	Author: Mitchell Seaton
-  *	Description: Creates a tab element.
-  * Wiki: 
-  */
- 
- %>
-<%@ tag body-content="empty" %>
-<%@ attribute name="id" required="true" rtexprvalue="true" %>
-<%@ attribute name="value" required="false" rtexprvalue="true" %>
-<%@ attribute name="key" required="false" rtexprvalue="true" %>
-<%@ attribute name="inactive" required="false" rtexprvalue="true" %>
-<%@ attribute name="methodCall" required="false" rtexprvalue="true" %>
+<%/****************************************************************
+			 * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+			 * =============================================================
+			 * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+			 * 
+			 * This program is free software; you can redistribute it and/or modify
+			 * it under the terms of the GNU General Public License version 2.0
+			 * as published by the Free Software Foundation.
+			 * 
+			 * This program is distributed in the hope that it will be useful,
+			 * but WITHOUT ANY WARRANTY; without even the implied warranty of
+			 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+			 * GNU General Public License for more details.
+			 * 
+			 * You should have received a copy of the GNU General Public License
+			 * along with this program; if not, write to the Free Software
+			 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+			 * USA
+			 * 
+			 * http://www.gnu.org/licenses/gpl.txt
+			 * ****************************************************************
+			 */
 
-<%@ taglib uri="tags-core" prefix="c" %>
-<%@ taglib uri="tags-bean" prefix="bean" %>
-<%@ taglib uri="tags-lams" prefix="lams" %>
-<c:set var="lams"><lams:LAMSURL/></c:set>
-<c:set var="tabTitle" value="${value}"/>
-<c:set var="tableftFile" value="aqua_tab_left.gif"/>
-<c:set var="tabrightFile" value="aqua_tab_right.gif"/>
-<c:set var="tabcentreClass" value="tab tabcentre"/>
+			/**
+			 * Tab.tag
+			 *	Author: Mitchell Seaton
+			 *	Description: Creates a tab element.
+			 * Wiki: 
+			 */
 
-<% // Usually methodCall is selectTab, but the calling code can override methodCall if desired.
-   // this is handy if the page needs different logic on initialisation and user switching tabs %>
+			%>
+<%@ tag body-content="empty"%>
+<%@ attribute name="id" required="true" rtexprvalue="true"%>
+<%@ attribute name="value" required="false" rtexprvalue="true"%>
+<%@ attribute name="key" required="false" rtexprvalue="true"%>
+<%@ attribute name="inactive" required="false" rtexprvalue="true"%>
+<%@ attribute name="methodCall" required="false" rtexprvalue="true"%>
+
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-bean" prefix="bean"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<c:set var="lams">
+	<lams:LAMSURL />
+</c:set>
+<c:set var="tabTitle" value="${value}" />
+<c:set var="tableftFile" value="aqua_tab_left.gif" />
+<c:set var="tabrightFile" value="aqua_tab_right.gif" />
+<c:set var="tabcentreClass" value="tab tabcentre" />
+
+<%// Usually methodCall is selectTab, but the calling code can override methodCall if desired.
+			// this is handy if the page needs different logic on initialisation and user switching tabs %>
 <c:if test="${methodCall == null}">
 	<c:choose>
-	<c:when test="${dControl}">
-		<c:set var="methodCall" value="doSelectTab"/>
-	</c:when>
-	<c:otherwise>
-		<c:set var="methodCall" value="selectTab"/>
-	</c:otherwise>
+		<c:when test="${dControl}">
+			<c:set var="methodCall" value="doSelectTab" />
+		</c:when>
+		<c:otherwise>
+			<c:set var="methodCall" value="selectTab" />
+		</c:otherwise>
 	</c:choose>
 </c:if>
- 
+
 <c:if test="${key != null && value == null}">
-	<c:set var="tabTitle"><bean:message name="key" scope="page"/></c:set>
+	<c:set var="tabTitle">
+		<bean:message name="key" scope="page" />
+	</c:set>
 </c:if>
 
 <c:if test="${inactive}">
-	<c:set var="tableftFile" value="aqua_tab_i_left.gif"/>
-	<c:set var="tabrightFile" value="aqua_tab_i_right.gif"/>
-	<c:set var="tabcentreClass" value="tab tabcentre_inactive"/>
+	<c:set var="tableftFile" value="aqua_tab_i_left.gif" />
+	<c:set var="tabrightFile" value="aqua_tab_i_right.gif" />
+	<c:set var="tabcentreClass" value="tab tabcentre_inactive" />
 </c:if>
 
+<!-- 
 <td>
 	<table border="0" cellspacing="0" cellpadding="0" width="120" summary="This table is being used for layout purposes only">
-	  <tr>
-		<td width="8"><a href="#" onClick="${methodCall}(${id});return false;" ><img src="${lams}images/${tableftFile}" name="tableft_${id}" width="8" height="22" border="0" id="tableft_${id}"/></a></td>
-		<td class="${tabcentreClass}" id="tab${id}" nowrap="nowrap"><a href="#" onClick="${methodCall}(${id});return false;" id="${id}" >${tabTitle}</a></td>
-		<td width="8"><a href="#" onClick="${methodCall}(${id});return false;" ><img src="${lams}images/${tabrightFile}" name="tabright_${id}" width="8" height="22" border="0" id="tabright_${id}"/></a></td></tr>
+		<tr>
+			<td width="8">
+				<a href="#" onClick="${methodCall}(${id});return false;"><img src="${lams}images/${tableftFile}" name="tableft_${id}" width="8" height="22" border="0" id="tableft_${id}" /></a>
+			</td>
+			<td class="${tabcentreClass}" id="tab${id}" nowrap="nowrap">
+				<a href="#" onClick="${methodCall}(${id});return false;" id="${id}">${tabTitle}</a>
+			</td>
+			<td width="8">
+				<a href="#" onClick="${methodCall}(${id});return false;"><img src="${lams}images/${tabrightFile}" name="tabright_${id}" width="8" height="22" border="0" id="tabright_${id}" /></a>
+			</td>
+		</tr>
 	</table>
-</td>
\ No newline at end of file
+</td>
+-->
+
+<div class="nav-box">
+	<div class="tab-left" id="tab-left-${id}"></div>
+	<div class="tab-middle" id="tab-middle-${id}">
+		<a class="tab-middle-link" id="tab-middle-link-${id}" href="#" onclick="${methodCall}(${id});return false;">${tabTitle}</a>
+	</div>
+	<div class="tab-right" id="tab-right-${id}"></div>
+</div>
Index: lams_tool_nb/web/WEB-INF/tags/TabBody.tag
===================================================================
diff -u -r65166da92a6f0f4ff73acb92b95672e237b25742 -r0a9205737ad38f2cde57c92fbee07f8d895aaf44
--- lams_tool_nb/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 65166da92a6f0f4ff73acb92b95672e237b25742)
+++ lams_tool_nb/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 0a9205737ad38f2cde57c92fbee07f8d895aaf44)
@@ -1,62 +1,52 @@
-<% 
-/****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- * =============================================================
- * License Information: http://lamsfoundation.org/licensing/lams/2.0/
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2.0
- * as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
- * USA
- * 
- * http://www.gnu.org/licenses/gpl.txt
- * ****************************************************************
- */
- 
- /**
-  * TabBody.tag
-  *	Author: Mitchell Seaton
-  *	Description: Creates the body container for a tab element
-  * Wiki: 
-  */
- 
- %>
-<%@ tag body-content="scriptless" %>
-<%@ attribute name="id" required="true" rtexprvalue="true" %>
-<%@ attribute name="tabTitle" required="false" rtexprvalue="true" %>
-<%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
-<%@ attribute name="page" required="false" rtexprvalue="true" %>
-<%@ taglib uri="tags-core" prefix="c" %>
-<%@ taglib uri="tags-bean" prefix="bean" %>
+<%/****************************************************************
+			 * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+			 * =============================================================
+			 * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+			 * 
+			 * This program is free software; you can redistribute it and/or modify
+			 * it under the terms of the GNU General Public License version 2.0
+			 * as published by the Free Software Foundation.
+			 * 
+			 * This program is distributed in the hope that it will be useful,
+			 * but WITHOUT ANY WARRANTY; without even the implied warranty of
+			 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+			 * GNU General Public License for more details.
+			 * 
+			 * You should have received a copy of the GNU General Public License
+			 * along with this program; if not, write to the Free Software
+			 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+			 * USA
+			 * 
+			 * http://www.gnu.org/licenses/gpl.txt
+			 * ****************************************************************
+			 */
 
+			/**
+			 * TabBody.tag
+			 *	Author: Mitchell Seaton
+			 *	Description: Creates the body container for a tab element
+			 * Wiki: 
+			 */
+
+		%>
+<%@ tag body-content="scriptless"%>
+<%@ attribute name="id" required="true" rtexprvalue="true"%>
+<%@ attribute name="tabTitle" required="false" rtexprvalue="true"%>
+<%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="page" required="false" rtexprvalue="true"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-bean" prefix="bean"%>
+
 <!-- begin tab content -->
-<div id="tabbody${id}">
-<c:if test="${tabTitle != null}">
-	<h2><font size=2> <b><bean:write name="tabTitle" scope="page"/></b></font></h2>
-</c:if>
-<c:if test="${titleKey != null && tabTitle == null}">
-	<h2><font size=2> <b><bean:message name="titleKey" scope="page"/></b></font></h2>
-</c:if>
+<div class="box" id="tabbody${id}">
+	<c:choose>
+		<c:when test="${page != null}">
+			<jsp:include page="${page}" />
+		</c:when>
+		<c:otherwise>
+			<jsp:doBody />
+		</c:otherwise>
+	</c:choose>
 
-<div id="formtablecontainer">
-<c:choose>
-	<c:when test="${page != null}">
-		<jsp:include page="${page}"/>
-	</c:when>
-	<c:otherwise>
-		<jsp:doBody/>
-	</c:otherwise>
-</c:choose>
 </div>
-
-</div>
-<!-- end tab content -->
\ No newline at end of file
+<!-- end tab content -->
Index: lams_tool_nb/web/WEB-INF/tags/Tabs.tag
===================================================================
diff -u -r65166da92a6f0f4ff73acb92b95672e237b25742 -r0a9205737ad38f2cde57c92fbee07f8d895aaf44
--- lams_tool_nb/web/WEB-INF/tags/Tabs.tag	(.../Tabs.tag)	(revision 65166da92a6f0f4ff73acb92b95672e237b25742)
+++ lams_tool_nb/web/WEB-INF/tags/Tabs.tag	(.../Tabs.tag)	(revision 0a9205737ad38f2cde57c92fbee07f8d895aaf44)
@@ -1,72 +1,69 @@
-<% 
-/****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- * =============================================================
- * License Information: http://lamsfoundation.org/licensing/lams/2.0/
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2.0
- * as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
- * USA
- * 
- * http://www.gnu.org/licenses/gpl.txt
- * ****************************************************************
- */
- 
- /**
-  * Tabs.tag
-  *	Author: Mitchell Seaton
-  *	Description: Create a tab list from a input collection or nested Tab tags.
-  * Wiki: 
-  */
- 
- %>
-<%@ tag body-content="scriptless" %>
-<%@ attribute name="collection" type="java.util.Collection" required="false" rtexprvalue="true" %>
-<%@ attribute name="control" required="false" rtexprvalue="true" %>
-<%@ attribute name="useKey" required="false" rtexprvalue="true" %>
-<%@ taglib uri="tags-core" prefix="c" %>
-<%@ taglib uri="tags-lams" prefix="lams" %>
-<c:set var="dControl" value="false" scope="request"/>
+<%/****************************************************************
+			 * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+			 * =============================================================
+			 * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+			 * 
+			 * This program is free software; you can redistribute it and/or modify
+			 * it under the terms of the GNU General Public License version 2.0
+			 * as published by the Free Software Foundation.
+			 * 
+			 * This program is distributed in the hope that it will be useful,
+			 * but WITHOUT ANY WARRANTY; without even the implied warranty of
+			 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+			 * GNU General Public License for more details.
+			 * 
+			 * You should have received a copy of the GNU General Public License
+			 * along with this program; if not, write to the Free Software
+			 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+			 * USA
+			 * 
+			 * http://www.gnu.org/licenses/gpl.txt
+			 * ****************************************************************
+			 */
+
+			/**
+			 * Tabs.tag
+			 *	Author: Mitchell Seaton
+			 *	Description: Create a tab list from a input collection or nested Tab tags.
+			 * Wiki: 
+			 */
+
+		%>
+<%@ tag body-content="scriptless"%>
+<%@ attribute name="collection" type="java.util.Collection" required="false" rtexprvalue="true"%>
+<%@ attribute name="control" required="false" rtexprvalue="true"%>
+<%@ attribute name="useKey" required="false" rtexprvalue="true"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<c:set var="dControl" value="false" scope="request" />
 <c:if test="${control}">
-	<c:set var="dControl" value="${control}" scope="request"/>
+	<c:set var="dControl" value="${control}" scope="request" />
 </c:if>
 
-<c:set var="dUseKey" value="false" scope="request"/>
+<c:set var="dUseKey" value="false" scope="request" />
 <c:if test="${useKey}">
-	<c:set var="dUseKey" value="${useKey}" scope="request"/>
+	<c:set var="dUseKey" value="${useKey}" scope="request" />
 </c:if>
 
 <!-- tab holder table -->
-<table border="0" cellspacing="0" cellpadding="0" summary="This table is being used for layout purposes only">
-  <tr valign="bottom">
-<c:choose>
-	<c:when test="${collection != null}">
-			<c:set var="count" value="0"/>
+<div id="nav">
+	<c:choose>
+		<c:when test="${collection != null}">
+			<c:set var="count" value="0" />
 			<c:forEach var="tab" begin="0" items="${collection}">
-				<c:set var="count" value="${count+1}"/>
+				<c:set var="count" value="${count+1}" />
 				<c:choose>
 					<c:when test="${dUseKey}">
-						<lams:Tab id="${count}" key="${tab}"/>
+						<lams:Tab id="${count}" key="${tab}" />
 					</c:when>
 					<c:otherwise>
-						<lams:Tab id="${count}" value="${tab}"/>
+						<lams:Tab id="${count}" value="${tab}" />
 					</c:otherwise>
 				</c:choose>
 			</c:forEach>
-	</c:when>
-	<c:otherwise>
-		<jsp:doBody/>
-	</c:otherwise>
-</c:choose>
-  </tr>
-</table>
\ No newline at end of file
+		</c:when>
+		<c:otherwise>
+			<jsp:doBody />
+		</c:otherwise>
+	</c:choose>
+</div>
Index: lams_tool_nb/web/WEB-INF/tags/headItems.tag
===================================================================
diff -u -r9bf9b53faf1c91294d4c2d9a306cb896e131d373 -r0a9205737ad38f2cde57c92fbee07f8d895aaf44
--- lams_tool_nb/web/WEB-INF/tags/headItems.tag	(.../headItems.tag)	(revision 9bf9b53faf1c91294d4c2d9a306cb896e131d373)
+++ lams_tool_nb/web/WEB-INF/tags/headItems.tag	(.../headItems.tag)	(revision 0a9205737ad38f2cde57c92fbee07f8d895aaf44)
@@ -1,41 +1,40 @@
-<% 
-/****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- * =============================================================
- * License Information: http://lamsfoundation.org/licensing/lams/2.0/
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2.0
- * as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
- * USA
- * 
- * http://www.gnu.org/licenses/gpl.txt
- * ****************************************************************
- */
- 
- /**
-  * Standard Head Items
-  *	Author: Fiona Malikoff
-  *	Description: Includes all the standard head items e.g. the 
-  * lams css files, sets the content type, standard javascript files.
-  */
- 
- %>
-<%@ tag body-content="empty" %>
+<%/****************************************************************
+			 * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+			 * =============================================================
+			 * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+			 * 
+			 * This program is free software; you can redistribute it and/or modify
+			 * it under the terms of the GNU General Public License version 2.0
+			 * as published by the Free Software Foundation.
+			 * 
+			 * This program is distributed in the hope that it will be useful,
+			 * but WITHOUT ANY WARRANTY; without even the implied warranty of
+			 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+			 * GNU General Public License for more details.
+			 * 
+			 * You should have received a copy of the GNU General Public License
+			 * along with this program; if not, write to the Free Software
+			 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+			 * USA
+			 * 
+			 * http://www.gnu.org/licenses/gpl.txt
+			 * ****************************************************************
+			 */
 
-<%@ taglib uri="tags-core" prefix="c" %>
-<%@ taglib uri="tags-lams" prefix="lams" %>
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
+			/**
+			 * Standard Head Items
+			 *	Author: Fiona Malikoff
+			 *	Description: Includes all the standard head items e.g. the 
+			 * lams css files, sets the content type, standard javascript files.
+			 */
 
+		%>
+<%@ tag body-content="empty"%>
+
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+
 <c:set var="lams">
 	<lams:LAMSURL />
 </c:set>
@@ -46,11 +45,17 @@
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 
 <lams:css />
+<!--[if IE]>
+<style type="text/css">
+@import url(${lams}/css/ie-styles.css);
+</style>
+<![endif]-->
+
 <link href="${lams}css/fckeditor_style.css" rel="stylesheet" type="text/css">
 
 <script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
 <script type="text/javascript" src="${lams}fckeditor/fckeditor.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/fckcontroller.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>
 <script type="text/javascript" src="${tool}includes/javascript/xmlrequest.js"></script>
-	
+
Index: lams_tool_nb/web/authoring/advance.jsp
===================================================================
diff -u
--- lams_tool_nb/web/authoring/advance.jsp	(revision 0)
+++ lams_tool_nb/web/authoring/advance.jsp	(revision 0a9205737ad38f2cde57c92fbee07f8d895aaf44)
@@ -0,0 +1 @@
+<p> This page shouldnt be here. </p>
\ No newline at end of file
Index: lams_tool_nb/web/authoring/authoring.jsp
===================================================================
diff -u -r160d995179aec345c5f37711392035bd1514b586 -r0a9205737ad38f2cde57c92fbee07f8d895aaf44
--- lams_tool_nb/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision 160d995179aec345c5f37711392035bd1514b586)
+++ lams_tool_nb/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision 0a9205737ad38f2cde57c92fbee07f8d895aaf44)
@@ -1,31 +1,26 @@
-<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
-<%@ taglib uri="tags-html" prefix="html" %>
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-core" prefix="c" %>
-<%@ taglib uri="tags-bean" prefix="bean" %>
-<%@ taglib uri="tags-logic" prefix="logic" %>
-<%@ taglib uri="tags-fck-editor" prefix="FCK" %>
-<%@ taglib uri="tags-lams" prefix="lams" %>
-<%@ page import="java.util.HashSet" %>
-<%@ page import="java.util.Set" %>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+        "http://www.w3.org/TR/html4/strict.dtd">
 
+<%@ include file="/includes/taglibs.jsp"%>
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD hTML 4.01 Transitional//EN">
 <html:html>
 <head>
-	<lams:headItems/>
+	<lams:headItems />
 	<title><fmt:message key="activity.title" /></title>
-	
-    <script>
+
+	<script type="text/javascript">
     
     	var imgRoot="<lams:LAMSURL />images/";
 	    var themeName="aqua";
         
         function init(){
-        
-            initTabSize(3);
-            
-            var tag = document.getElementById("currentTab");
+						
+			var showBasicContent = "${requestScope.showBasicContent}";
+			if (showBasicContent != "true") {
+	            initTabSize(3);
+	        }
+	        
+	        var tag = document.getElementById("currentTab");
 	    	if(tag.value != "")
 	    		selectTab(tag.value);
             else
@@ -42,68 +37,68 @@
         } 
         
         function active(tabId) {
-        	if(document.getElementById("tab" + tabId).className == "tab tabcentre_inactive")
-        		return false;
+        	//if(document.getElementById("tab" + tabId).className == "tab tabcentre_inactive")
+        	//	return false;
         	return true;
         }
- 
-    </script>
-    
+     </script>
 </head>
 
 <body onLoad="init()">
-<html:form action="/authoring" styleId="authoringForm" target="_self" enctype="multipart/form-data">
-<html:hidden property="currentTab" styleId="currentTab" />
+	<div id="page">
+		<html:form action="/authoring" styleId="authoringForm" target="_self" enctype="multipart/form-data">
+			<html:hidden property="currentTab" styleId="currentTab" />
 
-<h1><fmt:message key="activity.title" /></h1>
-    
-<%@ include file="../errorbox.jsp" %> <!-- show any error messages here -->
-    
-<% // in define later mode we only show the basic content, so no point showing the tabs. %>
-<c:if test="${requestScope.showBasicContent != 'true'}">
-	
-	<!-- start tabs -->
-	<lams:Tabs collection="${tabs}" useKey="true" control="true"/>
-	<lams:Tabs control="true">
-		<lams:Tab id="1" key="label.authoring.heading.basic"/>
-		<lams:Tab id="2" key="label.authoring.heading.advanced" inactive="true"/>
-		<lams:Tab id="3" key="label.authoring.heading.instructions"/>
-	</lams:Tabs>
-	<!-- end tab buttons -->
-</c:if>
+			<%// in define later mode we only show the basic content, so no point showing the tabs. %>
+			<c:choose>
+				<c:when test="${requestScope.showBasicContent != 'true'}">
+					<h1>
+						<fmt:message key="activity.title" />
+					</h1>
+					<div id="header">
+						<!-- start tabs -->
+						<lams:Tabs control="true">
+							<lams:Tab id="1" key="label.authoring.heading.basic" />
+							<lams:Tab id="2" key="label.authoring.heading.advanced" inactive="true" />
+							<lams:Tab id="3" key="label.authoring.heading.instructions" />
+						</lams:Tabs>
+						<!-- end tab buttons -->
+					</div>
+				</c:when>
+				<c:otherwise>
+					<h1 class="no-tabs-below">
+						<fmt:message key="activity.title" />
+					</h1>
+					<div id="header-no-tabs"></div>
+				</c:otherwise>
+			</c:choose>
 
-<div class="tabbody">
+			<div id="content">
+				<!-- show any error messages here -->
+				<%@ include file="../errorbox.jsp"%>
 
-<!-- tab content 1 (Basic) -->
-<lams:TabBody id="1" titleKey="label.authoring.heading.basic" page="basic.jsp"/>
-<!-- end of content (Basic) -->
-      
-<c:if test="${requestScope.showBasicContent != 'true'}">
-	<!-- tab content 2 (Advanced) -->
-	<lams:TabBody id="2" titleKey="label.authoring.heading.advanced" page="advance.jsp" />
-	<!-- end of content (Advanced) -->
+				<c:choose>
+					<c:when test="${requestScope.showBasicContent != 'true'}">
+						<!--  Set up tabs  -->
+						<lams:TabBody id="1" titleKey="label.authoring.heading.basic" page="basic.jsp" />
+						<lams:TabBody id="2" titleKey="label.authoring.heading.advanced" page="advance.jsp" />
+						<lams:TabBody id="3" titleKey="label.authoring.heading.instructions" page="instructions.jsp" />
+					</c:when>
+					<c:otherwise>
+						<!-- just include the basic page -->
+						<%@ include file="basic.jsp"%>
+					</c:otherwise>
+				</c:choose>
 
-	<!-- tab content 3 (Instructions) -->
-	<lams:TabBody id="3" titleKey="label.authoring.heading.instructions" page="instructions.jsp" />
-	<!-- end of content (Instructions) -->
-</c:if>
-
-<!-- Button Row -->
-<hr>
-<%--  Default value
-	cancelButtonLabelKey="label.authoring.cancel.button"
-	saveButtonLabelKey="label.authoring.save.button"
-	cancelConfirmMsgKey="authoring.msg.cancel.save"
-	accessMode="author"
---%>
-<c:set var="dispactchMethodName">
-	<fmt:message key="button.save"/>
-</c:set>
-<html:hidden property="method" value="${dispactchMethodName}"/>
-<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" toolSignature="lanb11" toolContentID="${toolContentID}" cancelButtonLabelKey="button.cancel" saveButtonLabelKey="button.save"/>
-
-</div>
-
-</html:form>
+				<!-- Button Row -->
+				<c:set var="dispactchMethodName">
+					<fmt:message key="button.save" />
+				</c:set>
+				<html:hidden property="method" value="${dispactchMethodName}" />
+				<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" toolSignature="lanb11" toolContentID="${toolContentID}" cancelButtonLabelKey="button.cancel" saveButtonLabelKey="button.save" />
+			</div>
+			<div id="footer" />
+		</html:form>
+	</div>
 </body>
 </html:html>
Index: lams_tool_nb/web/authoring/basic.jsp
===================================================================
diff -u -r992d0d544a920da849e7d1a6b3f2006f816f7d86 -r0a9205737ad38f2cde57c92fbee07f8d895aaf44
--- lams_tool_nb/web/authoring/basic.jsp	(.../basic.jsp)	(revision 992d0d544a920da849e7d1a6b3f2006f816f7d86)
+++ lams_tool_nb/web/authoring/basic.jsp	(.../basic.jsp)	(revision 0a9205737ad38f2cde57c92fbee07f8d895aaf44)
@@ -1,34 +1,33 @@
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-core" prefix="c" %>
-<%@ taglib uri="tags-fck-editor" prefix="FCK" %>
+<%@ include file="/includes/taglibs.jsp"%>
 
-<!---------------------------Basic Tab Content ------------------------>
-<table class="forms">
+<!-- Basic Tab Content  -->
+
+<table cellpadding="0">
 	<tr>
 		<td>
-			<table width="65%" align="center" >
-				<tr>
-					<td class="formlabel"><fmt:message key="basic.title" /></td>
-					<td class="formcontrol">
-							<FCK:editor id="title" basePath="/lams/fckeditor/"
-								height="150"
-								width="85%">
-								<c:out value="${NbAuthoringForm.title}" escapeXml="false" />
-							</FCK:editor>
-							
-					</td>
-				</tr>
-				<tr>
-					<td class="formlabel"><fmt:message key="basic.content" /></td>
-					<td class="formcontrol">
-						<FCK:editor id="content" basePath="/lams/fckeditor/"
-								width="85%"
-								height="400">
-							<c:out value="${NbAuthoringForm.content}" escapeXml="false" />
-						</FCK:editor>
-					</td>
-				</tr>
-			</table>
+			<div class="field-name">
+				<fmt:message key="basic.title" />
+			</div>
 		</td>
 	</tr>
+	<tr>
+		<td>
+			<FCK:editor id="title" basePath="/lams/fckeditor/" height="100" width="100%">
+				<c:out value="${NbAuthoringForm.title}" escapeXml="false" />
+			</FCK:editor>
+		</td>
+	</tr>
+
+	<tr>
+		<td class="field-name">
+			<fmt:message key="basic.content" />
+		</td>
+	</tr>
+	<tr>
+		<td>
+			<FCK:editor id="content" basePath="/lams/fckeditor/" width="100%" height="200">
+				<c:out value="${NbAuthoringForm.content}" escapeXml="false" />
+			</FCK:editor>
+		</td>
+	</tr>
 </table>
Index: lams_tool_nb/web/authoring/instructions.jsp
===================================================================
diff -u -r992d0d544a920da849e7d1a6b3f2006f816f7d86 -r0a9205737ad38f2cde57c92fbee07f8d895aaf44
--- lams_tool_nb/web/authoring/instructions.jsp	(.../instructions.jsp)	(revision 992d0d544a920da849e7d1a6b3f2006f816f7d86)
+++ lams_tool_nb/web/authoring/instructions.jsp	(.../instructions.jsp)	(revision 0a9205737ad38f2cde57c92fbee07f8d895aaf44)
@@ -1,124 +1,119 @@
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-core" prefix="c" %>
-<%@ taglib uri="tags-fck-editor" prefix="FCK" %>
-<%@ taglib uri="tags-html" prefix="html" %>
-<%@ taglib uri="tags-bean" prefix="bean" %>
-<%@ taglib uri="tags-logic" prefix="logic" %>
+<%@ include file="/includes/taglibs.jsp"%>
 
-<!---------------------------Instructions Tab Content ------------------------>
-<table class="forms">
+<!-- Instructions Tab Content  -->
+
+<table>
 	<tr>
+		<td class="field-name">
+			<fmt:message key="instructions.onlineInstructions" />
+		</td>
+	</tr>
+	<tr>
 		<td>
-			<table width="65%" align="center">
-				<tr>
-					<td class="formlabel"><fmt:message key="instructions.onlineInstructions" /></td>
-					<td class="formcontrol">
-							<FCK:editor id="onlineInstructions" basePath="/lams/fckeditor/"
-								height="200"
-								width="85%">
-								<c:out value="${NbAuthoringForm.onlineInstructions}" escapeXml="false" />
-							</FCK:editor>
-					</td>
-				</tr>
-				
-				<tr>
-					<td class="formlabel">
-						<fmt:message key="instructions.uploadOnlineInstr" />
-					</td>
-					<td class="formcontrol">
-						<html:file property="onlineFile" /><html:submit property="method"><fmt:message key="button.upload" /></html:submit>
-											
-					</td>						
-				</tr>
-				<tr>
-					<td class="formlabel"><fmt:message key="instructions.offlineInstructions" /></td>
-					<td class="formcontrol">
-						<FCK:editor id="offlineInstructions" basePath="/lams/fckeditor/"
-								width="85%"
-								height="200">
-							<c:out value="${NbAuthoringForm.offlineInstructions}" escapeXml="false" />
-						</FCK:editor>
-					</td>
-				</tr>
-				<tr>
-					<td class="formlabel">
-						<fmt:message key="instructions.uploadOfflineInstr" />
-					</td>
-					<td class="formcontrol">
-						<html:file property="offlineFile" /><html:submit property="method"><fmt:message key="button.upload" /></html:submit>
-					</td>						
-				</tr>
-			
-			</table>
+			<FCK:editor id="onlineInstructions" basePath="/lams/fckeditor/" height="200" width="100%">
+				<c:out value="${NbAuthoringForm.onlineInstructions}" escapeXml="false" />
+			</FCK:editor>
 		</td>
 	</tr>
+
+	<tr>
+		<td class="field-name">
+			<fmt:message key="instructions.uploadOnlineInstr" />
+		</td>
+	</tr>
+	<tr>
+		<td>
+			<html:file property="onlineFile" />
+			<html:submit property="method">
+				<fmt:message key="button.upload" />
+			</html:submit>
+
+		</td>
+	</tr>
 </table>
 
+<hr />
+
+<table>
+	<tr>
+		<td class="field-name-alternative-color">
+			<fmt:message key="instructions.offlineInstructions" />
+		</td>
+	</tr>
+	<tr>
+		<td>
+			<FCK:editor id="offlineInstructions" basePath="/lams/fckeditor/" width="100%" height="200">
+				<c:out value="${NbAuthoringForm.offlineInstructions}" escapeXml="false" />
+			</FCK:editor>
+		</td>
+	</tr>
+	<tr>
+		<td class="field-name-alternative-color">
+			<fmt:message key="instructions.uploadOfflineInstr" />
+		</td>
+	</tr>
+	<tr>
+		<td>
+			<html:file property="offlineFile" />
+			<html:submit property="method">
+				<fmt:message key="button.upload" />
+			</html:submit>
+		</td>
+	</tr>
+</table>
+
 <logic:present name="attachmentList">
-<bean:size id="count" name="attachmentList" />
-<logic:notEqual name="count" value="0">
+	<bean:size id="count" name="attachmentList" />
+	<logic:notEqual name="count" value="0">
+		<hr />
 
-	<h2><fmt:message key="label.attachments" /></h2>
-	<div id="datatablecontainer">
-		<table width="100%"  border="0" cellspacing="0" cellpadding="0">
+		<h2>
+			<fmt:message key="label.attachments" />
+		</h2>
+
+		<table width="70%" align="left">
 			<tr>
-				<td>
-					<table width="70%" align="left">
-		            <tr>
-		                <td><fmt:message key="label.filename" /></td>
-		                <td><fmt:message key="label.type" /></td>
-		            	<td>&nbsp;</td>
-		            </tr>
-		            <logic:iterate name="attachmentList" id="attachment">
-		            	<bean:define id="view">/download/?uuid=<bean:write name="attachment" property="uuid"/>&preferDownload=false</bean:define>
-						<bean:define id="download">/download/?uuid=<bean:write name="attachment" property="uuid"/>&preferDownload=true</bean:define>
-                        <bean:define id="uuid" name="attachment" property="uuid" />
-                        
-                        <tr>
-			                         	
-			            	<td><bean:write name="attachment" property="filename"/></td>
-			                <td>
-			                	<c:choose>
-					            	<c:when test="${attachment.onlineFile}" >
-					                	<fmt:message key="instructions.type.online" />
-					               	</c:when>
-					                <c:otherwise>
-					                	<fmt:message key="instructions.type.offline" />
-					                </c:otherwise>
-				                </c:choose>
-				            </td>
-				            <td>
-					        	<table>
-						        	<tr>
-						            	<td>
-						                	<a href='javascript:launchInstructionsPopup("<html:rewrite page='<%=view%>'/>")' class="button">
-						                   		<fmt:message key="link.view" />
-						                    </a>
-						               	</td>
-						                <td>
-							            	<html:link page="<%=download%>" styleClass="button">
-							                	<fmt:message key="link.download" />
-							                </html:link>
-						                </td>
-						                <td>
-							            	<html:link page="/authoring.do?method=Delete" 
-							                         	paramId="uuid" paramName="attachment" paramProperty="uuid"
-							                         	onclick="javascript:return confirm('Are you sure you want to delete this file?')"
-							                         	target="_self" styleClass="button">
-							                	<fmt:message key="link.delete" />
-							                </html:link> 
-							            </td>
-						           	</tr>
-					            </table>
-				           	</td>
-			   	     	</tr>
-		    	    </logic:iterate>
-					</table>
-			 	</td>
+				<th>
+					<fmt:message key="label.filename" />
+				</th>
+				<th>
+					<fmt:message key="label.type" />
+				</th>
+				<th>
+					&nbsp;
+				</th>
 			</tr>
-		</table>
-	</div>
-	
- </logic:notEqual>
- </logic:present>
+			<logic:iterate name="attachmentList" id="attachment">
+				<bean:define id="view">/download/?uuid=<bean:write name="attachment" property="uuid" />&preferDownload=false</bean:define>
+				<bean:define id="download">/download/?uuid=<bean:write name="attachment" property="uuid" />&preferDownload=true</bean:define>
+				<bean:define id="uuid" name="attachment" property="uuid" />
 
+				<tr>
+					<td>
+						<bean:write name="attachment" property="filename" />
+					</td>
+					<td>
+						<c:choose>
+							<c:when test="${attachment.onlineFile}">
+								<fmt:message key="instructions.type.online" />
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="instructions.type.offline" />
+							</c:otherwise>
+						</c:choose>
+					</td>
+					<td>
+						<a href='javascript:launchInstructionsPopup("<html:rewrite page='<%=view%>'/>")' class="button"> <fmt:message key="link.view" /> </a>
+
+						<html:link page="<%=download%>" styleClass="button">
+							<fmt:message key="link.download" />
+						</html:link>
+						<html:link page="/authoring.do?method=Delete" paramId="uuid" paramName="attachment" paramProperty="uuid" onclick="javascript:return confirm('Are you sure you want to delete this file?')" target="_self" styleClass="button">
+							<fmt:message key="link.delete" />
+						</html:link>
+					</td>
+				</tr>
+			</logic:iterate>
+		</table>
+	</logic:notEqual>
+</logic:present>
Index: lams_tool_nb/web/includes/taglibs.jsp
===================================================================
diff -u
--- lams_tool_nb/web/includes/taglibs.jsp	(revision 0)
+++ lams_tool_nb/web/includes/taglibs.jsp	(revision 0a9205737ad38f2cde57c92fbee07f8d895aaf44)
@@ -0,0 +1,11 @@
+<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8"%>
+
+<%@ taglib uri="tags-bean" prefix="bean"%>
+<%@ taglib uri="tags-logic" prefix="logic"%>
+<%@ taglib uri="tags-tiles" prefix="tiles"%>
+<%@ taglib uri="tags-html" prefix="html"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-fck-editor" prefix="FCK"%>
+ 
\ No newline at end of file