Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaResources.properties
===================================================================
diff -u -r6b23705da47d357c71585779cf61f68cbab7b3d1 -reca9ea46fefb353002e27446469b7c406e9fa621
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaResources.properties	(.../QaResources.properties)	(revision 6b23705da47d357c71585779cf61f68cbab7b3d1)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaResources.properties	(.../QaResources.properties)	(revision eca9ea46fefb353002e27446469b7c406e9fa621)
@@ -1,8 +1,12 @@
 # Project lams_tool_qa
 #Authoring mode resources
+label.authoring							=Q/A Authoring
 label.authoring.qa						=Questions and Answers
 label.authoring.title					=Title
 label.authoring.instructions			=Instructions
+label.authoring.qa.basic				=Please define the questions. 
+label.advanced.definitions				=Advanced Definitions
+label.authoring.instructions			=Instructions
 instructions.type.online                =Online
 instructions.type.offline               =Offline
 link.view                               =View
Index: lams_tool_laqa/web/AdvancedContent.jsp
===================================================================
diff -u -r4612d0cc25ab35780dd85154e3399238e4c5bf63 -reca9ea46fefb353002e27446469b7c406e9fa621
--- lams_tool_laqa/web/AdvancedContent.jsp	(.../AdvancedContent.jsp)	(revision 4612d0cc25ab35780dd85154e3399238e4c5bf63)
+++ lams_tool_laqa/web/AdvancedContent.jsp	(.../AdvancedContent.jsp)	(revision eca9ea46fefb353002e27446469b7c406e9fa621)
@@ -6,7 +6,7 @@
 
 <div id="advancedTabContainer">
 		<tr> <td>
-			<table class="forms">
+			<table align=center>
 				<tr>
 	      			<td NOWRAP class="formlabel" valign=top>
 		      			<font size=2> <b>
Index: lams_tool_laqa/web/BasicContent.jsp
===================================================================
diff -u -r170973684b9669d1651fc94d030976de0f28f415 -reca9ea46fefb353002e27446469b7c406e9fa621
--- lams_tool_laqa/web/BasicContent.jsp	(.../BasicContent.jsp)	(revision 170973684b9669d1651fc94d030976de0f28f415)
+++ lams_tool_laqa/web/BasicContent.jsp	(.../BasicContent.jsp)	(revision eca9ea46fefb353002e27446469b7c406e9fa621)
@@ -11,36 +11,36 @@
 			<tr> <td>
 					<table align=center> 
 						<tr> 
-					 		<td valign="top"> <bean:message key="label.authoring.title"/>: </td>
+					 		<td valign="top"><font size=2> <b> <bean:message key="label.authoring.title"/>: </b></font> </td>
 					 		<td NOWRAP width=700> <!-- Dave,I found width was necessary to present all the elements of the editor, feel free to change -->                            
                                 
                                  <span id="previewTitle" style="visibility: hidden; display: none;">
                                      <div>
-                                         <a href="javascript:doWYSWYGEdit('Title','small')">Open Richtext Editor</a>
+                                         <a href="javascript:doWYSWYGEdit('Title','small')"><font size=2> <b> Open Richtext Editor </a>
                                      </div>
                                      <div class="smallPreviewPanel" id="previewTitle.text"></div>
                                  </span>
                                  <span id="txTitle">
                                      <div>
-                                         <a href="javascript:doTextToHTML('Title'); doWYSWYGEdit('Title','small')">Open Richtext Editor</a>
+                                         <a href="javascript:doTextToHTML('Title'); doWYSWYGEdit('Title','small')"><font size=2> <b> Open Richtext Editor</a>
                                      </div>
                                      <textarea class="smallTextareaPanel" name="title" id="txTitle.textarea"><c:out value="${QaAuthoringForm.title}" escapeXml="false" /></textarea>
                                  </span>
                                 
 							</td> 
 					  	</tr>
 					  	<tr> 
-					 		<td valign="top"> <bean:message key="label.authoring.instructions"/>: </td>
+					 		<td valign="top"><font size=2> <b> <bean:message key="label.authoring.instructions"/>:  </b></font></td>
 					 		<td NOWRAP width=700> <!-- Dave,I found width was necessary to present all the elements of the editor, feel free to change -->
                                 <span id="previewInstructions" style="visibility: hidden; display: none;">
                                     <div>
-                                        <a href="javascript:doWYSWYGEdit('Instructions')">Open Richtext Editor</a>
+                                        <a href="javascript:doWYSWYGEdit('Instructions')"><font size=2> <b> Open Richtext Editor</a>
                                     </div>
                                     <div class="previewPanel" id="previewInstructions.text"></div>
                                 </span>
                                 <span id="txInstructions">
                                     <div>
-                                        <a href="javascript:doTextToHTML('Instructions'); doWYSWYGEdit('Instructions')">Open Richtext Editor</a>
+                                        <a href="javascript:doTextToHTML('Instructions'); doWYSWYGEdit('Instructions')"><font size=2> <b>Open Richtext Editor</a>
                                     </div>
                                     <textarea class="textareaPanel" name="instructions" id="txInstructions.textarea"><c:out value="${QaAuthoringForm.instructions}" escapeXml="false" /></textarea>
                                 </span>
@@ -50,7 +50,7 @@
 			 		<!--default question content, this entry can not be deleted but can be updated -->
 				 		<tr> 
 						  	<td valign="top"> 
-						 		<bean:message key="label.question1"/> : 
+						 		<font size=2> <b> <bean:message key="label.question1"/> :  </b></font>
 						 	</td>
 						  	<td>
                                 <span id="previewQuestion0" style="visibility: hidden; display: none;">
@@ -61,7 +61,7 @@
                                 </span>
                                 <span id="txQuestion0">
                                     <div>
-                                        <a href="javascript:doTextToHTML('Question0'); doWYSWYGEdit('Question0')">Open Richtext Editor</a>
+                                        <a href="javascript:doTextToHTML('Question0'); doWYSWYGEdit('Question0')"><font size=2> <b>Open Richtext Editor</a>
                                     </div>
                                     <textarea class="textareaPanel" name="questionContent0" id="txQuestion0.textarea"><c:out value="${sessionScope.defaultQuestionContent}"/></textarea>
                                 </span>
@@ -76,18 +76,18 @@
 					  		<c:if test="${questionEntry.key > 1}"> 			
 								<c:set var="queIndex" scope="session" value="${queIndex +1}"/>
 								  <tr>
-								  	<td valign="top"> <c:out value="Question ${queIndex}"/> : </td>
+								  	<td valign="top"> <font size=2> <b> <c:out value="Question ${queIndex}"/> :  </b></font></td>
 								  	<td>
   
                                         <span id="preview<c:out value="Question${queIndex-1}"/>" style="visibility: hidden; display: none;">
                                             <div>
-                                                <a href="javascript:doWYSWYGEdit('<c:out value="Question${queIndex-1}"/>')">Open Richtext Editor</a>
+                                                <a href="javascript:doWYSWYGEdit('<c:out value="Question${queIndex-1}"/>')"><font size=2> <b>Open Richtext Editor</a>
                                             </div>
                                             <div class="previewPanel" id="preview<c:out value="Question${queIndex-1}"/>.text"></div>
                                         </span>
                                         <span id="tx<c:out value="Question${queIndex-1}"/>">
                                             <div>
-                                                <a href="javascript:doTextToHTML('<c:out value="Question${queIndex-1}"/>'); doWYSWYGEdit('<c:out value="Question${queIndex-1}"/>')">Open Richtext Editor</a>
+                                                <a href="javascript:doTextToHTML('<c:out value="Question${queIndex-1}"/>'); doWYSWYGEdit('<c:out value="Question${queIndex-1}"/>')"><font size=2> <b>Open Richtext Editor</a>
                                             </div>
                                             <textarea class="textareaPanel" name="<c:out value="questionContent${queIndex-1}"/>" id="tx<c:out value="Question${queIndex-1}"/>.textarea"><c:out value="${questionEntry.value}"/></textarea>
                                         </span>
@@ -133,14 +133,14 @@
 			<tr> <td>
 					<table align=center>
 						<tr> 
-					 		<td> <bean:message key="label.authoring.title"/>: </td>
+					 		<td> <font size=2> <b> <bean:message key="label.authoring.title"/>:  </b></font></td>
 					 		<td NOWRAP width=700> <!-- Dave,I found width was necessary to present all the elements of the editor, feel free to change -->
 						 		<c:out value="${sessionScope.richTextTitle}" escapeXml="false" />
 							</td> 
 					  	</tr>
 
 					  	<tr> 
-					 		<td> <bean:message key="label.authoring.instructions"/>: </td> 
+					 		<td> <font size=2> <b> <bean:message key="label.authoring.instructions"/>:  </b></font></td> 
 					 		<td NOWRAP width=700> <!-- Dave,I found width was necessary to present all the elements of the editor, feel free to change -->
 							  <c:out value="${sessionScope.richTextInstructions}" escapeXml="false" />						  
 							</td>
@@ -149,8 +149,8 @@
 			 		<!--default question content, this entry can not be deleted but can be updated -->
 		
 				 		<tr> 
-						  	<td> 
-						  		<c:out value="Question 1"/> : </td>
+						  	<td> <font size=2> <b>
+						  		<c:out value="Question 1"/> :  </b></font></td>
 						  		<td>
 									<c:out value="${sessionScope.defaultQuestionContent}"/>
 						  		</td>
@@ -164,7 +164,7 @@
 					  		<c:if test="${questionEntry.key > 1}"> 			
 								<c:set var="queIndex" scope="session" value="${queIndex +1}"/>
 								  <tr>
-								  	<td> <c:out value="Question ${queIndex}"/> : </td>
+								  	<td> <font size=2> <b><c:out value="Question ${queIndex}"/> :  </b></font></td>
 								  		<td> <c:out value="${questionEntry.value}"/>
 									  	&nbsp
 									  	</td>
Index: lams_tool_laqa/web/InstructionsContent.jsp
===================================================================
diff -u -r170973684b9669d1651fc94d030976de0f28f415 -reca9ea46fefb353002e27446469b7c406e9fa621
--- lams_tool_laqa/web/InstructionsContent.jsp	(.../InstructionsContent.jsp)	(revision 170973684b9669d1651fc94d030976de0f28f415)
+++ lams_tool_laqa/web/InstructionsContent.jsp	(.../InstructionsContent.jsp)	(revision eca9ea46fefb353002e27446469b7c406e9fa621)
@@ -8,31 +8,35 @@
 
 
 <div id="richTextContainer">
-		<tr> <td>
+		<tr> <td align=center>
 			<table align=center>
 				<tr> 
-					<td>
+					<td NOWRAP  valign=top><font size=2> <b>
           				<fmt:message key="label.offlineInstructions" />:
+	          			</b>
+    	      			</font>
           			</td>
 					<td NOWRAP width=700> <!-- Dave,I found width was necessary to present all the elements of the editor, feel free to change -->
                         <span id="previewOfflineInstructions" style="visibility: hidden; display: none;">
                             <div>
-                                <a href="javascript:doWYSWYGEdit('OfflineInstructions')">Open Richtext Editor</a>
+                                <a href="javascript:doWYSWYGEdit('OfflineInstructions')"><font size=2> <b> Open Richtext Editor </font> </b></a>
                             </div>
                             <div class="previewPanel" id="previewOfflineInstructions.text"></div>
                         </span>
                         <span id="txOfflineInstructions">
                             <div>
-                                <a href="javascript:doTextToHTML('OfflineInstructions'); doWYSWYGEdit('OfflineInstructions')">Open Richtext Editor</a>
+                                <a href="javascript:doTextToHTML('OfflineInstructions'); doWYSWYGEdit('OfflineInstructions')"><font size=2> <b> Open Richtext Editor </font> </b> </a>
                             </div>
                             <textarea class="textareaPanel" name="offlineInstructions" id="txOfflineInstructions.textarea"><c:out value="${QaAuthoringForm.offlineInstructions}" escapeXml="false" /></textarea>
                         </span>
 					</td> 
 				</tr>
 
 				<tr> 
-					<td>
+					<td NOWRAP  valign=top><font size=2> <b>
           				<fmt:message key="label.offlineFiles" />
+	          			</b>
+    	      			</font> 
           			</td>
           			<td NOWRAP> 
 						<html:file  property="theOfflineFile"></html:file>
@@ -46,37 +50,31 @@
 					</td> 
 
 				</tr>
-				<tr> 
-					<td>
-          				<fmt:message key="label.uploadedOfflineFiles" />
-          			</td>
-					<td>         			
-         			
-					</td> 
-				</tr>
           		<tr> 
-          			<td>
-          				<fmt:message key="label.onlineInstructions" />
+					<td NOWRAP  valign=top><font size=2> <b>
+          				<fmt:message key="label.onlineInstructions" />:
+	       				</b> </font>
           			</td>
 					<td NOWRAP width=700> <!-- Dave,I found width was necessary to present all the elements of the editor, feel free to change -->
                         <span id="previewOnlineInstructions" style="visibility: hidden; display: none;">
                             <div>
-                                <a href="javascript:doWYSWYGEdit('OnlineInstructions')">Open Richtext Editor</a>
+                                <a href="javascript:doWYSWYGEdit('OnlineInstructions')"> <font size=2> <b> Open Richtext Editor </font> </b></a>
                             </div>
                             <div class="previewPanel" id="previewOnlineInstructions.text"></div>
                         </span>
                         <span id="txOnlineInstructions">
                             <div>
-                                <a href="javascript:doTextToHTML('OnlineInstructions'); doWYSWYGEdit('OnlineInstructions')">Open Richtext Editor</a>
+                                <a href="javascript:doTextToHTML('OnlineInstructions'); doWYSWYGEdit('OnlineInstructions')"><font size=2> <b> Open Richtext Editor </font> </b></a>
                             </div>
                             <textarea class="textareaPanel" name="onlineInstructions" id="txOnlineInstructions.textarea"><c:out value="${QaAuthoringForm.onlineInstructions}" escapeXml="false" /></textarea>
                         </span>
 					</td> 
 				</tr>
 				
 				<tr> 
-					<td>
-          				<fmt:message key="label.onlineFiles" />
+						<td NOWRAP  valign=top><font size=2> <b>
+	          				<fmt:message key="label.onlineFiles" />
+          				</b> </font>
           			</td>
           			<td NOWRAP> 
 						<html:file  property="theOnlineFile"></html:file>
@@ -90,35 +88,26 @@
 					</td> 
 				
 				</tr>
-				<tr>
-					<td>
-          				<fmt:message key="label.uploadedOnlineFiles" />
-          			</td>
-					<td>
-					</td> 
-				</tr>
-				
-				
           		</table>	  	
 
 		</td></tr>
-		<tr><td>
-		
 
+		<tr><td align=center>
+
 <logic:present name="attachmentList">
 <bean:size id="count" name="attachmentList" />
 
 <logic:notEqual name="count" value="0">
 
 	<h2><fmt:message key="label.attachments" /></h2>
 	<div id="datatablecontainer">
-		<table width="100%"  border="0" cellspacing="0" cellpadding="0">
+		<table width="100%" align=center  border="0" cellspacing="0" cellpadding="0">
 			<tr>
 				<td>
 					<table width="70%" align="left">
 		            <tr>
-		                <td><fmt:message key="label.filename" /></td>
-		                <td><fmt:message key="label.type" /></td>
+		                <td NOWRAP  valign=top><font size=2> <b><fmt:message key="label.filename" /> </b> </font> </td>
+		                <td NOWRAP  valign=top><font size=2> <b> <fmt:message key="label.type" /></b> </font> </td>
 		            	<td>&nbsp;</td>
 		            </tr>
 		            <logic:iterate name="attachmentList" id="attachment">
@@ -128,8 +117,9 @@
                         
                         <tr>
 			                         	
-			            	<td><bean:write name="attachment" property="fileName"/></td>
+			            	<td><font size=2>  <bean:write name="attachment" property="fileName"/> </font> </td>
 			                <td>
+								<font size=2> 
 			                	<c:choose>
 					            	<c:when test="${attachment.fileOnline}" >
 					                	<fmt:message key="instructions.type.online" />
@@ -138,6 +128,7 @@
 					                	<fmt:message key="instructions.type.offline" />
 					                </c:otherwise>
 				                </c:choose>
+								 </font>				                
 				            </td>
 				            <td>
 					        	<table>
@@ -148,17 +139,21 @@
 						                    </a>
 						               	</td>
 						                <td>
+              								<font size=2> <b>
 							            	<html:link page="<%=download%>" styleClass="button">
 							                	<fmt:message key="link.download" />
 							                </html:link>
+											</b> </font>				                							                
 						                </td>
 						                <td>
+											<font size=2> <b>						                
 							            	<html:link page="/authoring.do?dispatch=deleteFile" 
 							                         	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> 
+											</b> </font>				                							                							                
 							            </td>
 						           	</tr>
 					            </table>
Index: lams_tool_laqa/web/WEB-INF/lams.tld
===================================================================
diff -u -r8c9cc087f7be90e71c24ac01bbf7f2c8ba719cd8 -reca9ea46fefb353002e27446469b7c406e9fa621
--- lams_tool_laqa/web/WEB-INF/lams.tld	(.../lams.tld)	(revision 8c9cc087f7be90e71c24ac01bbf7f2c8ba719cd8)
+++ lams_tool_laqa/web/WEB-INF/lams.tld	(.../lams.tld)	(revision eca9ea46fefb353002e27446469b7c406e9fa621)
@@ -30,7 +30,7 @@
       </attribute>
 
    </tag>
-  <tag>
+   <tag>
 
       <name>css</name>
       <tagclass>org.lamsfoundation.lams.web.tag.CssTag</tagclass>
Index: lams_tool_laqa/web/WEB-INF/web.xml
===================================================================
diff -u -r02313a89605b75c535ed9845189c353654551dd7 -reca9ea46fefb353002e27446469b7c406e9fa621
--- lams_tool_laqa/web/WEB-INF/web.xml	(.../web.xml)	(revision 02313a89605b75c535ed9845189c353654551dd7)
+++ lams_tool_laqa/web/WEB-INF/web.xml	(.../web.xml)	(revision eca9ea46fefb353002e27446469b7c406e9fa621)
@@ -132,6 +132,11 @@
 	<error-code>403</error-code>
 	<location>/403.html</location>
 </error-page>
+
+	<taglib>
+	   <taglib-uri>tags-lams</taglib-uri>
+	   <taglib-location>/WEB-INF/lams.tld</taglib-location>
+	</taglib>
    
    <taglib>
     <taglib-uri>fck-editor</taglib-uri>
Index: lams_tool_laqa/web/author_page.jsp
===================================================================
diff -u -r170973684b9669d1651fc94d030976de0f28f415 -reca9ea46fefb353002e27446469b7c406e9fa621
--- lams_tool_laqa/web/author_page.jsp	(.../author_page.jsp)	(revision 170973684b9669d1651fc94d030976de0f28f415)
+++ lams_tool_laqa/web/author_page.jsp	(.../author_page.jsp)	(revision eca9ea46fefb353002e27446469b7c406e9fa621)
@@ -4,7 +4,11 @@
 <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
 <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
 <%@ taglib uri="fck-editor" prefix="FCK" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
 
+<c:set var="lams"><lams:LAMSURL/></c:set>
+<c:set var="tool"><lams:WebAppURL/></c:set>
+
 <%
 String protocol = request.getProtocol();
 if(protocol.startsWith("HTTPS")){
@@ -17,15 +21,14 @@
 
 %>
 
-<!DOCTYPE html
-PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD hTML 4.01 Transitional//EN">
 
-
 <html:html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>Tool</title>
+<title><bean:message key="label.authoring"/></title>
+
+<!-- depending on user / site preference this will get changed probbably use passed in variable from flash to select which one to use-->
 <script type="text/javascript" src="author_page/js/tabcontroller.js"></script>
 <script src="<%=pathToLams%>/includes/javascript/common.js"></script>
 <!-- this is the custom CSS for hte tool -->
@@ -123,7 +126,7 @@
 
     <!-- tab content one (basic)-->
     <div class="tabbody" id="tabbody1">
-        <h2>Basic tab content</h2>
+        <h2><font size=2> <b> <bean:message key="label.authoring.qa.basic"/> </b></font></h2>
         <div id="formtablecontainer">
             <jsp:include page="BasicContent.jsp" />
         </div>
@@ -137,7 +140,7 @@
 
     <!-- tab content 2 Advanced-->
     <div class="tabbody" id="tabbody2">
-        <h2>Advanced tab content</h2>
+        <h2><font size=2> <b> <bean:message key="label.advanced.definitions"/> </b></font></h2>
         <div id="formtablecontainer">
             <jsp:include page="AdvancedContent.jsp" />
         </div>
@@ -148,13 +151,13 @@
 
     <!-- tab content 3 instructions -->
     <div class="tabbody" id="tabbody3">
-        <h2>Instructions tab content </h2>
+        <h2><font size=2> <b> <bean:message key="label.authoring.instructions"/> </b></font></h2>
         <div id="formtablecontainer">
             <jsp:include page="InstructionsContent.jsp" />
         </div>
         <hr>
-        <a href="javascript:window.close()" class="button">Cancel</a>
-        <a href="javascript:submitMethod('submitAllContent')" class="button">Save</a>
+        <a href="javascript:window.close()" class="button"><font size=2> <b> Cancel </font> </b> </a>
+        <a href="javascript:submitMethod('submitAllContent')" class="button"><font size=2> <b> Save </font> </b></a>
     </div>
     <!-- end of content_a -->
 
@@ -172,8 +175,9 @@
                 </FCK:editor>  
             </div>
             <div style="text-align: center">
-                <a href="#" onClick="saveWYSWYGEdittedText(activeEditorIndex); doPreview(activeEditorIndex)">Save</a>
-                <a href="#" onClick="doPreview(activeEditorIndex)">Cancel</a>
+                <a href="#" onClick="saveWYSWYGEdittedText(activeEditorIndex); doPreview(activeEditorIndex)"> <font size=2> <b> Save </b> </font></a>
+                &nbsp&nbsp&nbsp&nbsp
+                <a href="#" onClick="doPreview(activeEditorIndex)"><font size=2> <b>Cancel </font> </b></a>
             </div>
         </div>
     </div>