Index: lams_www/build.xml
===================================================================
diff -u -r0b9b40de7fc41eaba04755e6e10ac34d6c52b1e2 -r127b352d99616000ff79eac3a697b1a919ff0d49
--- lams_www/build.xml	(.../build.xml)	(revision 0b9b40de7fc41eaba04755e6e10ac34d6c52b1e2)
+++ lams_www/build.xml	(.../build.xml)	(revision 127b352d99616000ff79eac3a697b1a919ff0d49)
@@ -100,5 +100,15 @@
 			</fileset>
 		</war>
 	</target>
+	
+	   <target name="copy-tags" depends="" description="copy the lams.tld and the lams tags">
+	   		<copy todir="${conf.webinf.dir}" overwrite="yes" file="${tag.web.dir}/lams.tld" />	
+			<copy todir="${conf.webinf.dir}/tags" overwrite="yes">
+				<fileset dir="${tag.web.dir}/tags">
+					<include name="*.tag" />
+				</fileset>
+			</copy>
+	   </target>
+
 </project>
 
Index: lams_www/web/WEB-INF/lams.tld
===================================================================
diff -u -r6b48d7643dda77bdad77a24c3af3f0b3d9cec1c2 -r127b352d99616000ff79eac3a697b1a919ff0d49
--- lams_www/web/WEB-INF/lams.tld	(.../lams.tld)	(revision 6b48d7643dda77bdad77a24c3af3f0b3d9cec1c2)
+++ lams_www/web/WEB-INF/lams.tld	(.../lams.tld)	(revision 127b352d99616000ff79eac3a697b1a919ff0d49)
@@ -13,6 +13,26 @@
 
    <tag>
 
+      <description>Converts role name into form usable as message resources key</description>
+      <display-name>Converts role name into form usable as message resources key</display-name>
+      <icon>    
+      </icon>
+      <name>role</name>
+      <tag-class>org.lamsfoundation.lams.web.tag.RoleTag</tag-class>
+      <body-content>empty</body-content>
+
+      <attribute>
+         <description>Converts role name into form usable as message resources key</description>
+         <name>role</name>
+         <required>true</required>
+
+           <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+
+   </tag>
+   <tag>
+
       <description>Output the Server URL as defined in the lams.xml configuration file.</description>
       <display-name>LAMS URL</display-name>
       <icon>    
@@ -24,6 +44,74 @@
    </tag>
    <tag>
 
+      <description>converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
+      <display-name>converts text from \n or \r\n to &lt;BR&gt; before rendering</display-name>
+      <icon>    
+      </icon>
+      <name>out</name>
+      <tag-class>org.lamsfoundation.lams.web.tag.MultiLinesOutputTag</tag-class>
+      <body-content>empty</body-content>
+
+      <attribute>
+         <description>converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
+         <name>value</name>
+         <required>true</required>
+
+           <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+
+   </tag>
+   <tag>
+
+      <description>Render html tag with direction and language</description>
+      <display-name>Render html tag with direction and language</display-name>
+      <icon>    
+      </icon>
+      <name>html</name>
+      <tag-class>org.lamsfoundation.lams.web.tag.HtmlTag</tag-class>
+      <body-content>JSP</body-content>
+
+      <attribute>
+         <description>Render html tag with direction and language</description>
+         <name>xhtml</name>
+         <required>false</required>
+
+           <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+
+   </tag>
+   <tag>
+
+      <description>Help tag</description>
+      <display-name>Help tag</display-name>
+      <icon>    
+      </icon>
+      <name>help</name>
+      <tag-class>org.lamsfoundation.lams.web.tag.HelpTag</tag-class>
+      <body-content>empty</body-content>
+
+      <attribute>
+         <description>Help tag</description>
+         <name>module</name>
+         <required>true</required>
+
+           <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+      <attribute>
+         <description>Help tag</description>
+         <name>toolSignature</name>
+         <required>true</required>
+
+           <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+
+   </tag>
+   <tag>
+
       <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
       <display-name>generate unique ID</display-name>
       <icon>    
@@ -91,7 +179,15 @@
            <rtexprvalue>true</rtexprvalue>
 
       </attribute>
+      <attribute>
+         <description>Output stylesheet based on the user preferences.</description>
+         <name>style</name>
+         <required>false</required>
 
+           <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+
    </tag>
 
   	<tag>
@@ -287,14 +383,10 @@
        <path>/WEB-INF/tags/TabBody.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>HTMLEditor</name>
-       <path>/WEB-INF/tags/HTMLEditor.tag</path>
+       <name>FCKEditor</name>
+       <path>/WEB-INF/tags/FCKEditor.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>SetEditor</name>
-       <path>/WEB-INF/tags/SetEditor.tag</path>
-   	</tag-file>
-   	<tag-file>
        <name>AuthoringButton</name>
        <path>/WEB-INF/tags/AuthoringButton.tag</path>
    	</tag-file>   	
@@ -310,8 +402,13 @@
 	    <name>ExportPortOutput</name>
 		<path>/WEB-INF/tags/ExportPortOutput.tag</path>
    	</tag-file>  
-	<tag-file>
+   	<tag-file>
 	    <name>Date</name>
 		<path>/WEB-INF/tags/Date.tag</path>
    	</tag-file>  
+   	<tag-file>
+	    <name>DefineLater</name>
+		<path>/WEB-INF/tags/DefineLater.tag</path>
+   	</tag-file>  
+
 </taglib>
Index: lams_www/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r127b352d99616000ff79eac3a697b1a919ff0d49
--- lams_www/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_www/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 127b352d99616000ff79eac3a697b1a919ff0d49)
@@ -37,6 +37,7 @@
 <%@ attribute name="formID" required="true" rtexprvalue="true" %>
 <%@ attribute name="toolSignature" required="true" rtexprvalue="true" %>
 <%@ attribute name="toolContentID" required="true" rtexprvalue="true" %>
+<%@ attribute name="contentFolderID" required="true" rtexprvalue="true" %>
 <%@ attribute name="clearSessionActionUrl" required="true" rtexprvalue="true" %>
 
 <%-- Optional attribute --%>
@@ -64,7 +65,7 @@
 <!-- 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}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}'/>";
+       	location.href="<c:url value='${clearSessionActionUrl}?action=confirm&mode=${accessMode}&signature=${toolSignature}&toolContentID=${toolContentID}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&contentFolderID=${contentFolderID}'/>";
 	}
     function doSubmit_Form_Only() {
     	document.getElementById("${formID}").submit();
@@ -81,7 +82,7 @@
 		}
     }  				
 </script>				
-<p align="right">
+<p style="text-align: right">
 	<html:link href="javascript:doSubmit_Form_Only();" property="submit" styleClass="button">
 		<fmt:message key="${saveButtonLabelKey}" /> 
 	</html:link>
Index: lams_www/web/WEB-INF/tags/Date.tag
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r127b352d99616000ff79eac3a697b1a919ff0d49
--- lams_www/web/WEB-INF/tags/Date.tag	(.../Date.tag)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_www/web/WEB-INF/tags/Date.tag	(.../Date.tag)	(revision 127b352d99616000ff79eac3a697b1a919ff0d49)
@@ -32,6 +32,21 @@
  %>
 <%@ tag body-content="empty" %>
 <%@ attribute name="value" required="true" rtexprvalue="true" type="java.util.Date" %>
+<%@ attribute name="style" required="false" rtexprvalue="true"%>
+<%@ attribute name="type" required="false" rtexprvalue="true"%>
+
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-<fmt:formatDate value="${value}" type="both" dateStyle="long" timeStyle="full" />
+<%@ taglib uri="tags-core" prefix="c" %>
 
+<c:if test="${empty type}">
+	<c:set var="type" value="both" scope="request"/>
+</c:if>
+
+<c:choose>
+	<c:when test="${style=='short'}">
+		<fmt:formatDate value="${value}" type="${type}" dateStyle="short" timeStyle="short" />
+	</c:when>
+	<c:otherwise>
+		<fmt:formatDate value="${value}" type="${type}" dateStyle="long" timeStyle="full" />
+	</c:otherwise>
+</c:choose>
Index: lams_www/web/WEB-INF/tags/FCKEditor.tag
===================================================================
diff -u
--- lams_www/web/WEB-INF/tags/FCKEditor.tag	(revision 0)
+++ lams_www/web/WEB-INF/tags/FCKEditor.tag	(revision 127b352d99616000ff79eac3a697b1a919ff0d49)
@@ -0,0 +1,57 @@
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="fck-editor" prefix="fck"%>
+
+<%@ attribute name="id" required="true" rtexprvalue="true"%>
+<%@ attribute name="value" required="true" rtexprvalue="true"%>
+<%@ attribute name="toolbarSet" required="false" rtexprvalue="true"%>
+<%@ attribute name="contentFolderID" required="true" rtexprvalue="true"%>
+
+<c:set var="language">
+	<lams:user property="localeLanguage" />
+</c:set>
+
+<c:if test="${empty toolbarSet}">
+	<c:set var="toolbarSet" value="Default" />
+</c:if>
+
+<c:set var="basePath" value="/lams/fckeditor/" />
+
+<!-- 
+<script type="text/javascript">
+	var oFCKeditor=new FCKeditor('${id}');
+	oFCKeditor.BasePath= "${basePath}";
+	oFCKeditor.ToolbarSet= "${toolbarSet}";
+	oFCKeditor.Value= '${value}';
+
+	oFCKeditor.Config["ImageBrowserURL"]= "${basePath}editor/filemanager/browser/default/browser.html?Type=Image&amp;Connector=connectors/jsp/connector&amp;CurrentFolder=/${contentFolderID}/";
+	oFCKeditor.Config["LinkBrowserURL"]=  "${basePath}editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&amp;CurrentFolder=/${contentFolderID}/";
+	oFCKeditor.Config["FlashBrowserURL"]= "${basePath}editor/filemanager/browser/default/browser.html?Type=Flash&amp;Connector=connectors/jsp/connector&amp;CurrentFolder=/${contentFolderID}/";
+	oFCKeditor.Config["ImageUploadURL"]=  "${basePath}editor/filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/";
+	oFCKeditor.Config["LinkUploadURL"]=   "${basePath}editor/filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/";
+	oFCKeditor.Config["FlashUploadURL"]=  "${basePath}editor/filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/";
+
+	oFCKeditor.Config["AutoDetectLanguage"]= false ;
+	oFCKeditor.Config["DefaultLanguage"]= "${language}" ;
+
+	oFCKeditor.Create();
+</script>
+-->
+
+<fck:editor id="${id}"
+	basePath="${basePath}"
+	toolbarSet="${toolbarSet}"
+	imageBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
+	imageUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/"
+	linkBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
+	linkUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/"
+	flashBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
+	flashUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/"
+	autoDetectLanguage="false"
+	defaultLanguage="${language}">
+		${value}
+</fck:editor>
+
+
+
+
Index: lams_www/web/WEB-INF/tags/Tab.tag
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r127b352d99616000ff79eac3a697b1a919ff0d49
--- lams_www/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_www/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision 127b352d99616000ff79eac3a697b1a919ff0d49)
@@ -1,32 +1,32 @@
 <%/****************************************************************
-			 * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
-			 * USA
-			 * 
-			 * http://www.gnu.org/licenses/gpl.txt
-			 * ****************************************************************
-			 */
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
 
-			/**
-			 * Tab.tag
-			 *	Author: Mitchell Seaton
-			 *	Description: Creates a tab element.
-			 * Wiki: 
-			 */
+/**
+ * Tab.tag
+ *	Author: Mitchell Seaton
+ *	Description: Creates a tab element.
+ * Wiki: 
+ */
 
 			%>
 <%@ tag body-content="empty"%>
Index: lams_www/web/WEB-INF/tags/TabBody.tag
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r127b352d99616000ff79eac3a697b1a919ff0d49
--- lams_www/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_www/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 127b352d99616000ff79eac3a697b1a919ff0d49)
@@ -1,32 +1,32 @@
 <%/****************************************************************
-			 * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
-			 * USA
-			 * 
-			 * http://www.gnu.org/licenses/gpl.txt
-			 * ****************************************************************
-			 */
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
 
-			/**
-			 * TabBody.tag
-			 *	Author: Mitchell Seaton
-			 *	Description: Creates the body container for a tab element
-			 * Wiki: 
-			 */
+/**
+ * TabBody.tag
+ *	Author: Mitchell Seaton
+ *	Description: Creates the body container for a tab element
+ * Wiki: 
+ */
 
 		%>
 <%@ tag body-content="scriptless"%>
Index: lams_www/web/WEB-INF/tags/Tabs.tag
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r127b352d99616000ff79eac3a697b1a919ff0d49
--- lams_www/web/WEB-INF/tags/Tabs.tag	(.../Tabs.tag)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_www/web/WEB-INF/tags/Tabs.tag	(.../Tabs.tag)	(revision 127b352d99616000ff79eac3a697b1a919ff0d49)
@@ -1,32 +1,32 @@
 <%/****************************************************************
-			 * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
-			 * USA
-			 * 
-			 * http://www.gnu.org/licenses/gpl.txt
-			 * ****************************************************************
-			 */
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * 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: 
-			 */
+/**
+ * Tabs.tag
+ *	Author: Mitchell Seaton
+ *	Description: Create a tab list from a input collection or nested Tab tags.
+ * Wiki: 
+ */
 
 		%>
 <%@ tag body-content="scriptless"%>
Index: lams_www/web/WEB-INF/tags/headItems.tag
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r127b352d99616000ff79eac3a697b1a919ff0d49
--- lams_www/web/WEB-INF/tags/headItems.tag	(.../headItems.tag)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_www/web/WEB-INF/tags/headItems.tag	(.../headItems.tag)	(revision 127b352d99616000ff79eac3a697b1a919ff0d49)
@@ -1,32 +1,32 @@
 <%/****************************************************************
-			 * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
-			 * USA
-			 * 
-			 * http://www.gnu.org/licenses/gpl.txt
-			 * ****************************************************************
-			 */
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * 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.
-			 */
+/**
+ * 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"%>
@@ -44,7 +44,8 @@
 
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 
-<lams:css />
+<lams:css style="tabbed"/>
+
 <link href="${lams}css/fckeditor_style.css" rel="stylesheet" type="text/css">
 
 <script type="text/javascript" src="${lams}includes/javascript/common.js"></script>