Index: lams_tool_nb/web/errorbox.jsp
===================================================================
diff -u -r28ee094d9b04c0fb37dcbd7a6472a7da7ae72d4f -rd496758b1ea374494a5860a724b0597bf2836a68
--- lams_tool_nb/web/errorbox.jsp	(.../errorbox.jsp)	(revision 28ee094d9b04c0fb37dcbd7a6472a7da7ae72d4f)
+++ lams_tool_nb/web/errorbox.jsp	(.../errorbox.jsp)	(revision d496758b1ea374494a5860a724b0597bf2836a68)
@@ -1,21 +1,17 @@
-<%@ taglib uri="tags-html" prefix="html" %>
-<%@ taglib uri="tags-core" prefix="c" %>
-<%@ taglib uri="tags-logic" prefix="logic" %>
-<%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ include file="/includes/taglibs.jsp"%>
 
-<div id="datatablecontainer">
-<logic:messagesPresent> 
-<table border="0" cellspacing="2" cellpadding="2" summary="This table is being used for layout purposes only">
-<tr>
-	<td width="10%"  align="right" >
-		<img src="<lams:LAMSURL/>/images/error.jpg" alt="Error occured"/>
-	</td>
-	<td width="90%" valign="middle" class="body" colspan="2">
-		 <html:messages id="error" message="false"> 
-			 <c:out value="${error}" escapeXml="false"/><BR>
-		 </html:messages> 
-	</td>
-</tr>
+<logic:messagesPresent>
+	<table cellpadding="0">
+		<tr>
+			<td width="10%" align="right">
+				<img src="<lams:LAMSURL/>/images/error.jpg" alt="Error occured" />
+			</td>
+			<td width="90%" valign="middle" class="body">
+				<html:messages id="error" message="false">
+					<c:out value="${error}" escapeXml="false" />
+					<BR>
+				</html:messages>
+			</td>
+		</tr>
+	</table>
 </logic:messagesPresent>
-</div>
-
Index: lams_tool_nb/web/header.jsp
===================================================================
diff -u -r8d197d915eef154832e3bd8073e35bd974ec2c5a -rd496758b1ea374494a5860a724b0597bf2836a68
--- lams_tool_nb/web/header.jsp	(.../header.jsp)	(revision 8d197d915eef154832e3bd8073e35bd974ec2c5a)
+++ lams_tool_nb/web/header.jsp	(.../header.jsp)	(revision d496758b1ea374494a5860a724b0597bf2836a68)
@@ -1,27 +1,26 @@
 <%@ include file="/includes/taglibs.jsp"%>
 
-<c:set var="lams"><lams:LAMSURL/></c:set>
+<c:set var="lams">
+	<lams:LAMSURL />
+</c:set>
 
-<tr>
-<td>
-<table width="100%" border="0" cellpadding="0" cellspacing="0" summary="This table is being used for layout purposes only">
-  <tr> 
-    <td width="136" height="10"></td>
-    <td width="92%" height="10"></td>
-  </tr>
-  <tr bgcolor="#282871"> 
-    <td width="50%" height="15" align="left">
-    		<img height=8 width=8 src="<c:out value="${lams}"/>/images/spacer.gif">
-    		<font color="#FFFFFF" size="1" face="Verdana, Arial, Helvetica, sans-serif"><c:out value="${pageheader}" />
-</font>
-    </td>        
-    <td width="50%" height="15" align="right" > 
-    		<a href="<c:out value="${lams}"/>/doc/LAMS_Learner_Guide_b60.pdf" target = 0>
-    			<font color="#FFFFFF" size="1" face="Verdana, Arial, Helvetica, sans-serif">[HELP]</font>
-    		</a>
-    		<img height=8 width=8 src="<c:out value="${lams}"/>/images/spacer.gif"  alt="space image">
-    </td>
-  </tr>
-</table>
-</td>
-</tr>
+<!--<tr>-->
+<!--	<td>-->
+<!--		<table width="100%" border="0" cellpadding="0" cellspacing="0" summary="This table is being used for layout purposes only">-->
+<!--			<tr>-->
+<!--				<td width="136" height="10"></td>-->
+<!--				<td width="92%" height="10"></td>-->
+<!--			</tr>-->
+<!--			<tr bgcolor="#282871">-->
+<!--				<td width="50%" height="15" align="left">-->
+<!--					<img height=8 width=8 src="<c:out value="${lams}"/>/images/spacer.gif">-->
+<!--					<font color="#FFFFFF" size="1" face="Verdana, Arial, Helvetica, sans-serif"><c:out value="${pageheader}" /> </font>-->
+<!--				</td>-->
+<!--				<td width="50%" height="15" align="right">-->
+<!--					<a href="<c:out value="${lams}"/>/doc/LAMS_Learner_Guide_b60.pdf" target=0> <font color="#FFFFFF" size="1" face="Verdana, Arial, Helvetica, sans-serif">[HELP]</font> </a>-->
+<!--					<img height=8 width=8 src="<c:out value="${lams}"/>/images/spacer.gif" alt="space image">-->
+<!--				</td>-->
+<!--			</tr>-->
+<!--		</table>-->
+<!--	</td>-->
+<!--</tr>-->
Index: lams_tool_nb/web/learnerContent.jsp
===================================================================
diff -u -r28ee094d9b04c0fb37dcbd7a6472a7da7ae72d4f -rd496758b1ea374494a5860a724b0597bf2836a68
--- lams_tool_nb/web/learnerContent.jsp	(.../learnerContent.jsp)	(revision 28ee094d9b04c0fb37dcbd7a6472a7da7ae72d4f)
+++ lams_tool_nb/web/learnerContent.jsp	(.../learnerContent.jsp)	(revision d496758b1ea374494a5860a724b0597bf2836a68)
@@ -1,42 +1,30 @@
-<%@ taglib uri="tags-html" prefix="html" %>
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-core" prefix="c" %>
+<%@ include file="/includes/taglibs.jsp"%>
 
+<table cellpadding="0">
+	<tr>
+		<td>
+			<h1>
+				<c:out value="${NbLearnerForm.title}" escapeXml="false" />
+			</h1>
 
-<html:form action="/learner" target="_self" >
-<hr>
-<BR>
-<div id="datatablecontainer">
-	<table width="100%" border="0" cellspacing="0" cellpadding="0">
+			<p>
+				<c:out value="${NbLearnerForm.content}" escapeXml="false" />
+			</p>
+		</td>
+	</tr>
+
+	<c:if test="${sessionScope.readOnlyMode != 'true'}">
 		<tr>
-			<td align="center">
-			<c:out value="${NbLearnerForm.title}" escapeXml="false"/>
+			<td align="right">
+				<html:form action="/learner" target="_self">
+					<html:submit property="method">
+						<fmt:message key="button.finish" />
+					</html:submit>
+				</html:form>
 			</td>
 		</tr>
-		<tr>
-			<td>&nbsp;</td>
-			<td>&nbsp;</td>
-		</tr>
-		<tr>
-			<td align="left">
-				<c:out value="${NbLearnerForm.content}" escapeXml="false"/>
-			</td>
-		</tr>
-		
-	</table>
-</div>
-
-<div id="formtablecontainer">
-<c:if test="${sessionScope.readOnlyMode != 'true'}" >
-<table width="100%">
-<tr>
-	<td align="right">
-		<html:submit property="method"><fmt:message key="button.finish"/></html:submit>
-	</td>	
-</tr>
+	</c:if>
 </table>
-</c:if>
-</div>
-<BR>
-<hr>
-</html:form>
+
+
+
Index: lams_tool_nb/web/message.jsp
===================================================================
diff -u -r28ee094d9b04c0fb37dcbd7a6472a7da7ae72d4f -rd496758b1ea374494a5860a724b0597bf2836a68
--- lams_tool_nb/web/message.jsp	(.../message.jsp)	(revision 28ee094d9b04c0fb37dcbd7a6472a7da7ae72d4f)
+++ lams_tool_nb/web/message.jsp	(.../message.jsp)	(revision d496758b1ea374494a5860a724b0597bf2836a68)
@@ -1,29 +1,21 @@
-<%@ taglib uri="tags-html" prefix="html" %>
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-bean" prefix="bean" %>
-<%@ taglib uri="tags-logic" prefix="logic" %>
+<%@ include file="/includes/taglibs.jsp"%>
 
-<div id="datatablecontainer">
-<table width="100%">
-<logic:messagesPresent message="true">
-<html:messages id="message" message="true">	
-<tr>
-	<td>
-		<bean:write name="message"/>
-	</td>	
-</tr>
-</html:messages>
-</logic:messagesPresent>
+<table cellpadding="0">
+	<logic:messagesPresent message="true">
+		<html:messages id="message" message="true">
+			<tr>
+				<td>
+					<bean:write name="message" />
+				</td>
+			</tr>
+		</html:messages>
+	</logic:messagesPresent>
 
-<tr>
-	<td align="right">
-		<html:button property="closeWindow" onclick="window.close()" styleClass="button">
-			<fmt:message key="button.next"/>
-		</html:button>
-	</td>
-</tr>
+	<tr>
+		<td align="right">
+			<html:button property="closeWindow" onclick="window.close()" styleClass="button">
+				<fmt:message key="button.next" />
+			</html:button>
+		</td>
+	</tr>
 </table>
-
-</div>
-<BR>
-<hr>
Index: lams_tool_nb/web/template/template.jsp
===================================================================
diff -u -re6e6aa4b83b6a5f62f7cae530495663c3bab242e -rd496758b1ea374494a5860a724b0597bf2836a68
--- lams_tool_nb/web/template/template.jsp	(.../template.jsp)	(revision e6e6aa4b83b6a5f62f7cae530495663c3bab242e)
+++ lams_tool_nb/web/template/template.jsp	(.../template.jsp)	(revision d496758b1ea374494a5860a724b0597bf2836a68)
@@ -1,59 +1,40 @@
-<%-- 
-Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
-License Information: http://lamsfoundation.org/licensing/lams/2.0/
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+        "http://www.w3.org/TR/html4/strict.dtd">
 
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License version 2 as 
-  published by the Free Software Foundation.
+<%@ include file="/includes/taglibs.jsp"%>
 
-  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.
+<c:set var="lams">
+	<lams:LAMSURL />
+</c:set>
+<c:set var="tool">
+	<lams:WebAppURL />
+</c:set>
 
-  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
+<html:html>
+<head>
+	<html:base />
+	<lams:headItems />
+	<title><fmt:message key="activity.title" /></title>
+</head>
 
-  http://www.gnu.org/licenses/gpl.txt
---%>
-<%@ 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-tiles" prefix="tiles" %>
-<%@ taglib uri="tags-lams" prefix="lams" %>
+<body>
+	<div id="page">
+		<c:set var="pageheader" scope="session">
+			<tiles:getAsString name="pageHeader" />
+		</c:set>
 
-<c:set var="lams"><lams:LAMSURL/></c:set>
-<c:set var="tool"><lams:WebAppURL/></c:set>
+		<h1 class="no-tabs-below">
+			<c:out value="${sessionScope.pageheader}" />
+		</h1>
 
+		<div id="header-no-tabs"></div>
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html:html locale = "true">
-    <head>
-      <html:base/>
-		<lams:headItems/>
-	<title><fmt:message key="activity.title" /></title>
-   </head>
-    
-    <body summary="This table is being used for layout purposes only">
-      
-        <!-- header -->
-        <c:set var="pageheader" scope="session"><tiles:getAsString name="pageHeader"/></c:set>
-		
-	
-		<h1>
-		<c:out value="${sessionScope.pageheader}"/>
-		</h1>
-        <!-- end of header -->
-        
-        <!-- main content -->
-		
-        <tiles:insert attribute="content" />
-	
-        <!--end of main content-->
-        
-       
-    </body>
+		<div id="content">
+			<tiles:insert attribute="content" />
+		</div>
+
+		<div id="footer">
+		</div>
+	</div>
+</body>
 </html:html>