Index: lams_tool_chat/web/pages/authoring/instructions.jsp
===================================================================
diff -u -r467d38ce63854f33b9ee6794c67ba250b52fa7ba -re2752a42cc475f7524dc223c1fd712940c57b39a
--- lams_tool_chat/web/pages/authoring/instructions.jsp	(.../instructions.jsp)	(revision 467d38ce63854f33b9ee6794c67ba250b52fa7ba)
+++ lams_tool_chat/web/pages/authoring/instructions.jsp	(.../instructions.jsp)	(revision e2752a42cc475f7524dc223c1fd712940c57b39a)
@@ -89,20 +89,14 @@
 			<div class="field-name">
 				<fmt:message key="instructions.uploadOnlineInstr" />
 			</div>
+			<html:file property="onlineFile">
+			</html:file>
+			<html:link href="javascript:doSubmit('uploadOnline');"
+				property="submit" styleClass="button">
+				<fmt:message key="button.upload" />
+			</html:link>
 		</td>
 	</tr>
-	<tr>
-		<td>
-			<div class="space-left">
-				<html:file property="onlineFile">
-				</html:file>
-				<html:link href="javascript:doSubmit('uploadOnline');"
-					property="submit" styleClass="button">
-					<fmt:message key="button.upload" />
-				</html:link>
-			</div>
-		</td>
-	</tr>
 
 	<tr>
 		<td>
@@ -200,19 +194,13 @@
 			<div class="field-name-alternative-color">
 				<fmt:message key="instructions.uploadOfflineInstr" />
 			</div>
+			<html:file property="offlineFile">
+			</html:file>
+			<html:link href="javascript:doSubmit('uploadOffline');"
+				property="submit" styleClass="button">
+				<fmt:message key="button.upload" />
+			</html:link>
 		</td>
 	</tr>
-	<tr>
-		<td>
-			<div class="space-left">
-				<html:file property="offlineFile">
-				</html:file>
-				<html:link href="javascript:doSubmit('uploadOffline');"
-					property="submit" styleClass="button">
-					<fmt:message key="button.upload" />
-				</html:link>
-			</div>
-		</td>
-	</tr>
 
 </table>
Index: lams_tool_forum/web/common/header.jsp
===================================================================
diff -u -rf393908c737e5401dda3b995bacb6e4c4a5e5a50 -re2752a42cc475f7524dc223c1fd712940c57b39a
--- lams_tool_forum/web/common/header.jsp	(.../header.jsp)	(revision f393908c737e5401dda3b995bacb6e4c4a5e5a50)
+++ lams_tool_forum/web/common/header.jsp	(.../header.jsp)	(revision e2752a42cc475f7524dc223c1fd712940c57b39a)
@@ -21,7 +21,7 @@
 <link href="<html:rewrite page='/includes/css/tool_custom.css'/>" rel="stylesheet" type="text/css">
 <c:choose>
 	<c:when test="${not empty localLinkPath}">
-		<lams:css localLinkPath="${localLinkPath}"/>
+		<lams:css localLinkPath="${localLinkPath}" />
 	</c:when>
 	<c:otherwise>
 		<lams:css />
Index: lams_tool_forum/web/jsps/authoring/advance.jsp
===================================================================
diff -u -r467d38ce63854f33b9ee6794c67ba250b52fa7ba -re2752a42cc475f7524dc223c1fd712940c57b39a
--- lams_tool_forum/web/jsps/authoring/advance.jsp	(.../advance.jsp)	(revision 467d38ce63854f33b9ee6794c67ba250b52fa7ba)
+++ lams_tool_forum/web/jsps/authoring/advance.jsp	(.../advance.jsp)	(revision e2752a42cc475f7524dc223c1fd712940c57b39a)
@@ -2,129 +2,127 @@
 
 <!--   Advance Tab Content    -->
 
-
-
 <!-- Advance options Row -->
 
 <p class="small-space-top">
+	<html:checkbox property="forum.lockWhenFinished" styleClass="noBorder"
+		styleId="lockWhenFinished">
+	</html:checkbox>
+	<label for="lockWhenFinished">
+		<fmt:message key="label.authoring.advance.lock.on.finished" />
+	</label>
+</p>
 
-	<html:checkbox property="forum.lockWhenFinished" styleClass="noBorder">
-		<span class="space-left"><fmt:message
-				key="label.authoring.advance.lock.on.finished" />
-		</span>
+<p>
+	<html:checkbox property="forum.allowEdit" styleClass="noBorder"
+		styleId="allowEdit">
 	</html:checkbox>
+	<label for="allowEdit">
+		<fmt:message key="label.authoring.advance.allow.edit" />
+	</label>
 </p>
 
 <p>
-	<html:checkbox property="forum.allowEdit" styleClass="noBorder">
-		<span class="space-left"><fmt:message
-				key="label.authoring.advance.allow.edit" />
-		</span>
+	<html:checkbox property="forum.allowUpload" styleClass="noBorder"
+		styleId="allowUpload">
 	</html:checkbox>
+	<label for="allowUpload">
+		<fmt:message key="label.authoring.advance.allow.upload" />
+	</label>
 </p>
 
-
-<p><html:checkbox property="forum.allowUpload" styleClass="noBorder">
-		<span class="space-left"><fmt:message
-				key="label.authoring.advance.allow.upload" />
-		</span>
-	</html:checkbox></p>
-
-
-
-	<p><html:checkbox property="forum.allowRichEditor" styleId="richEditor"
+<p>
+	<html:checkbox property="forum.allowRichEditor" styleId="richEditor"
 		styleClass="noBorder">
-		<span class="space-left"><fmt:message
-				key="label.authoring.advance.use.richeditor" />
-		</span>
-	</html:checkbox></p>
+	</html:checkbox>
+	<label for="richEditor">
+		<fmt:message key="label.authoring.advance.use.richeditor" />
+	</label>
+</p>
 
-
-	<p><html:checkbox property="forum.limitedInput" styleId="limitedInput"
+<p>
+	<html:checkbox property="forum.limitedInput" styleId="limitedInput"
 		styleClass="noBorder">
-		<span class="space-left"><fmt:message
-				key="label.authoring.advance.limited.input" />
-		</span>
 	</html:checkbox>
-	<html:text property="forum.limitedChar" styleId="limitedChar" /></p>
+	<label for="limitedInput">
+		<fmt:message key="label.authoring.advance.limited.input" />
+	</label>
 
+	<html:text property="forum.limitedChar" styleId="limitedChar" />
+</p>
 
-
-	<p><html:checkbox property="forum.reflectOnActivity" styleClass="noBorder"
+<p>
+	<html:checkbox property="forum.reflectOnActivity" styleClass="noBorder"
 		styleId="reflectOn">
-		<span class="space-left"><fmt:message
-				key="advanced.reflectOnActivity" />
-		</span>
-	</html:checkbox></p>
+	</html:checkbox>
+	<label for="reflectOn">
+		<fmt:message key="advanced.reflectOnActivity" />
+	</label>
+</p>
 
-
-
-	<p><span class="space-left"><html:textarea
+<p>
+	<span class="space-left"> <html:textarea
 			property="forum.reflectInstructions" styleId="reflectInstructions"
-			cols="30" rows="3" />
-	</span></p>
+			cols="30" rows="3" /> </span>
+</p>
 
-
-
 <h2>
 	<fmt:message key="message.posting.limiting" />
 </h2>
 
-
-
 <p>
-<html:radio property="forum.allowNewTopic" value="true"
-	onclick="allowNewTopic()">
-	<span class="space-left"><fmt:message
-			key="label.authoring.advance.allow.new.topics" />
-	</span>
-</html:radio>
+	<html:radio property="forum.allowNewTopic" value="true"
+		onclick="allowNewTopic()" styleId="allowNewTopic1">
+	</html:radio>
+	<label for="allowNewTopic1">
+		<fmt:message key="label.authoring.advance.allow.new.topics" />
+	</label>
 </p>
 
 <p>
-<html:radio property="forum.allowNewTopic" value="false"
-	onclick="allowNewTopic()">
-	<span class="space-left"><fmt:message
-			key="label.authoring.advance.number.reply" />
-	</span>
-</html:radio>
+	<html:radio property="forum.allowNewTopic" value="false"
+		onclick="allowNewTopic()" styleId="allowNewTopic2">
+	</html:radio>
+	<label for="allowNewTopic2">
+		<fmt:message key="label.authoring.advance.number.reply" />
+	</label>
 </p>
 
 <p>
-<fmt:message key="label.authoring.advance.minimum.reply" />
-<html:select property="forum.minimumReply" styleId="minimumReply">
-	<html:option value="0">
-		<fmt:message key="label.authoring.advance.no.minimum" />
-	</html:option>
-	<html:option value="1">1</html:option>
-	<html:option value="2">2</html:option>
-	<html:option value="3">3</html:option>
-	<html:option value="4">4</html:option>
-	<html:option value="5">5</html:option>
-	<html:option value="6">6</html:option>
-	<html:option value="7">7</html:option>
-	<html:option value="8">8</html:option>
-	<html:option value="9">9</html:option>
-	<html:option value="10">10</html:option>
-</html:select>
+	<fmt:message key="label.authoring.advance.minimum.reply" />
+	<html:select property="forum.minimumReply" styleId="minimumReply">
+		<html:option value="0">
+			<fmt:message key="label.authoring.advance.no.minimum" />
+		</html:option>
+		<html:option value="1">1</html:option>
+		<html:option value="2">2</html:option>
+		<html:option value="3">3</html:option>
+		<html:option value="4">4</html:option>
+		<html:option value="5">5</html:option>
+		<html:option value="6">6</html:option>
+		<html:option value="7">7</html:option>
+		<html:option value="8">8</html:option>
+		<html:option value="9">9</html:option>
+		<html:option value="10">10</html:option>
+	</html:select>
 
 
-<fmt:message key="label.authoring.advance.maximum.reply" />
-<html:select property="forum.maximumReply" styleId="maximumReply">
-	<html:option value="0">
-		<fmt:message key="label.authoring.advance.no.maximum" />
-	</html:option>
-	<html:option value="1">1</html:option>
-	<html:option value="2">2</html:option>
-	<html:option value="3">3</html:option>
-	<html:option value="4">4</html:option>
-	<html:option value="5">5</html:option>
-	<html:option value="6">6</html:option>
-	<html:option value="7">7</html:option>
-	<html:option value="8">8</html:option>
-	<html:option value="9">9</html:option>
-	<html:option value="10">10</html:option>
-</html:select>
+	<fmt:message key="label.authoring.advance.maximum.reply" />
+	<html:select property="forum.maximumReply" styleId="maximumReply">
+		<html:option value="0">
+			<fmt:message key="label.authoring.advance.no.maximum" />
+		</html:option>
+		<html:option value="1">1</html:option>
+		<html:option value="2">2</html:option>
+		<html:option value="3">3</html:option>
+		<html:option value="4">4</html:option>
+		<html:option value="5">5</html:option>
+		<html:option value="6">6</html:option>
+		<html:option value="7">7</html:option>
+		<html:option value="8">8</html:option>
+		<html:option value="9">9</html:option>
+		<html:option value="10">10</html:option>
+	</html:select>
 
 </p>
 
Index: lams_tool_forum/web/jsps/authoring/basic.jsp
===================================================================
diff -u -r467d38ce63854f33b9ee6794c67ba250b52fa7ba -re2752a42cc475f7524dc223c1fd712940c57b39a
--- lams_tool_forum/web/jsps/authoring/basic.jsp	(.../basic.jsp)	(revision 467d38ce63854f33b9ee6794c67ba250b52fa7ba)
+++ lams_tool_forum/web/jsps/authoring/basic.jsp	(.../basic.jsp)	(revision e2752a42cc475f7524dc223c1fd712940c57b39a)
@@ -67,7 +67,7 @@
 
 			<p class="small-space-bottom"><a
 				href="javascript:showMessage('<html:rewrite page="/authoring/newTopic.do?sessionMapID=${formBean.sessionMapID}"/>');"
-				 class="button"> <fmt:message
+				 class="button-add-item"> <fmt:message
 					key="label.authoring.create.new.topic" /> </a></p>
 	
 			<iframe
Index: lams_tool_forum/web/jsps/authoring/message/create.jsp
===================================================================
diff -u -r467d38ce63854f33b9ee6794c67ba250b52fa7ba -re2752a42cc475f7524dc223c1fd712940c57b39a
--- lams_tool_forum/web/jsps/authoring/message/create.jsp	(.../create.jsp)	(revision 467d38ce63854f33b9ee6794c67ba250b52fa7ba)
+++ lams_tool_forum/web/jsps/authoring/message/create.jsp	(.../create.jsp)	(revision e2752a42cc475f7524dc223c1fd712940c57b39a)
@@ -50,8 +50,8 @@
 						<a href="#" onclick="getElementById('topicFormId').submit();" class="button-add-item">
 							<fmt:message key="button.add" />
 						</a>
-						&nbsp; &nbsp;
-						<a href="#" onclick="javascript:window.parent.hideMessage()" class="button">
+						
+						<a href="#" onclick="javascript:window.parent.hideMessage()" class="button space-left">
 							<fmt:message key="button.cancel" />
 						</a>
 					
Index: lams_tool_forum/web/jsps/authoring/message/edit.jsp
===================================================================
diff -u -rd72cf676b7ac9de46a6f6a9cdb96b2439ed6287f -re2752a42cc475f7524dc223c1fd712940c57b39a
--- lams_tool_forum/web/jsps/authoring/message/edit.jsp	(.../edit.jsp)	(revision d72cf676b7ac9de46a6f6a9cdb96b2439ed6287f)
+++ lams_tool_forum/web/jsps/authoring/message/edit.jsp	(.../edit.jsp)	(revision e2752a42cc475f7524dc223c1fd712940c57b39a)
@@ -5,63 +5,78 @@
 <html>
 	<head>
 		<%@ include file="/common/header.jsp"%>
+		<lams:css style="tabbed"/>
 		<script type="text/javascript">
 			var removeItemAttachmentUrl = "<c:url value="/authoring/deleteAttachment.do"/>";
 		</script>
-		
-		<script type="text/javascript" src="${tool}includes/javascript/message.js"></script>
-		
+
+		<script type="text/javascript"
+			src="${tool}includes/javascript/message.js"></script>
+
 	</head>
 	<body>
-		<div class="content">
-		<table cellpadding="3" width="100%">
-			<!-- Basic Info Form-->
-			<%@ include file="/common/messages.jsp"%>
-			<html:form action="/authoring/updateTopic.do" focus="message.subject" enctype="multipart/form-data" styleId="topicFormId">
-				<input type="hidden" name="topicIndex" value="<c:out value="${topicIndex}"/>">
-				<html:hidden property="sessionMapID"/>
-				<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-				<c:set var="sessionMap" value="${sessionScope[formBean.sessionMapID]}"/>
+	
+			<table>
+				<!-- Basic Info Form-->
+				<%@ include file="/common/messages.jsp"%>
+				<html:form action="/authoring/updateTopic.do"
+					focus="message.subject" enctype="multipart/form-data"
+					styleId="topicFormId">
+					<input type="hidden" name="topicIndex"
+						value="<c:out value="${topicIndex}"/>">
+					<html:hidden property="sessionMapID" />
+					<c:set var="formBean"
+						value="<%=request
+										.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+					<c:set var="sessionMap"
+						value="${sessionScope[formBean.sessionMapID]}" />
 
-				<tr>
-					<td>
-						<b><bean:message key="message.label.subject" />*</b><BR>
-						<html:text size="30" tabindex="1" property="message.subject" />
-						<BR>
-						<html:errors property="message.subject" />
-					</td>
-				</tr>
-				<tr>
-					<td>
-						<b><bean:message key="message.label.body" />*</b>
-						<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
-						<lams:FCKEditor id="message.body" value="${formBean.message.body}" contentFolderID="${sessionMap.contentFolderID}"></lams:FCKEditor>
-						<html:errors property="message.body" />
-					</td>
-				</tr>
-				<tr>
-					<td>
-						<b><bean:message key="message.label.attachment" /></b>
-						<c:set var="itemAttachment" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
+					<tr>
+						<td>
+							<div class="field-name">
+								<fmt:message key="message.label.subject" />
+								*
+							</div>
+							<html:text size="30" tabindex="1" property="message.subject" />
+							<br />
+							<html:errors property="message.subject" />
+						</td>
+					</tr>
+					<tr>
+						<td>
+							<div class="field-name"><fmt:message key="message.label.body" />*
+					</div>
+							<c:set var="formBean"
+								value="<%=request
+										.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+							<lams:FCKEditor id="message.body"
+								value="${formBean.message.body}"
+								contentFolderID="${sessionMap.contentFolderID}"></lams:FCKEditor>
+							<html:errors property="message.body" />
+						</td>
+					</tr>
+					<tr>
+						<td>
+							<div class="field-name"><fmt:message key="message.label.attachment" />
+							</div>
+							<c:set var="itemAttachment"
+								value="<%=request
+										.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 							<div id="itemAttachmentArea">
 								<%@ include file="/jsps/authoring/parts/msgattachment.jsp"%>
-							</div>						
-					</td>
-				</tr>
-				<tr>
-					<td align="center" valign="bottom"><p>
-						<a href="#" onclick="getElementById('topicFormId').submit();" class="button-add-item">
-							<bean:message key="button.add" />
-						</a>
-						&nbsp; &nbsp;
-						<a href="#" onclick="javascript:window.parent.hideMessage()" class="button">
-							<bean:message key="button.cancel" />
-						</a>					
-						</p>
-					</td>
-				</tr>
-			</html:form>
-		</table>
-		</div>
+							</div>
+					
+							<div class="space-top">
+								<a href="#" onclick="getElementById('topicFormId').submit();"
+									class="button-add-item"> <fmt:message key="button.add" />
+								</a>
+								<a href="#" onclick="javascript:window.parent.hideMessage()"
+									class="button space-left"> <fmt:message key="button.cancel" /> </a>
+							</div>
+						</td>
+					</tr>
+				</html:form>
+			</table>
+	
 	</body>
 </html>
Index: lams_tool_forum/web/jsps/authoring/message/view.jsp
===================================================================
diff -u -rc58afe2a22283663b8afaeb88ebc21eb020d45d6 -re2752a42cc475f7524dc223c1fd712940c57b39a
--- lams_tool_forum/web/jsps/authoring/message/view.jsp	(.../view.jsp)	(revision c58afe2a22283663b8afaeb88ebc21eb020d45d6)
+++ lams_tool_forum/web/jsps/authoring/message/view.jsp	(.../view.jsp)	(revision e2752a42cc475f7524dc223c1fd712940c57b39a)
@@ -8,64 +8,70 @@
 		<lams:css style="tabbed" />
 	</head>
 	<body>
-		<div class="content">
-			<table class="forum">
-				<!-- Basic Info Form-->
+
+		<table class="forum" cellspacing="0">
+			<!-- Basic Info Form-->
+			<tr>
+				<th>
+					${topic.message.subject}
+				</th>
+			</tr>
+			<tr>
+				<td class="posted-by">
+					<fmt:message key="lable.topic.subject.by" />
+					${topic.author} -
+					<lams:Date value="${topic.message.created}" />
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<c:out value="${topic.message.body}" escapeXml="false" />
+				</td>
+			</tr>
+
+			<c:if test="${not empty topic.message.attachments}">
 				<tr>
-					<th class="first">
-						${topic.message.subject}
-					</th>
-				</tr>
-				<tr>
-					<td class="first posted-by">
-						<fmt:message key="lable.topic.subject.by" />
-						${topic.author} -
-						<lams:Date value="${topic.message.created}" />
-					</td>
-				</tr>
-				<tr>
-					<td class="first">
-						<c:out value="${topic.message.body}" escapeXml="false" />
-					</td>
-				</tr>
-				<tr>
 					<td>
-						<c:forEach var="file" items="${topic.message.attachments}">
-							<c:set var="downloadURL">
-								<html:rewrite
-									page="/download/?uuid=${file.fileUuid}&versionID=${file.fileVersionId}&preferDownload=true" />
-							</c:set>
-							<a href="<c:out value='${downloadURL}' escapeXml='false'/>">
-								<c:out value="${file.fileName}" /> </a>
-						</c:forEach>
+						<ul>
+							<c:forEach var="file" items="${topic.message.attachments}">
+								<li>
+									<c:set var="downloadURL">
+										<html:rewrite
+											page="/download/?uuid=${file.fileUuid}&versionID=${file.fileVersionId}&preferDownload=true" />
+									</c:set>
+									<a href="<c:out value='${downloadURL}' escapeXml='false'/>">
+										<c:out value="${file.fileName}" /> </a>
+								</li>
+							</c:forEach>
+						</ul>
 					</td>
 				</tr>
-				<tr>
-					<td align="center">
-						<html:link href="javascript:window.parent.hideMessage()"
-							styleClass="button space-left">
-							<fmt:message key="button.cancel" />
-						</html:link>
-						<c:set var="deletetopic">
-							<html:rewrite
-								page="/authoring/deleteTopic.do?sessionMapID=${sessionMapID}&topicIndex=${topicIndex}" />
-						</c:set>
-						<html:link href="${deletetopic}" styleClass="button space-left">
-							<fmt:message key="label.delete" />
-						</html:link>
-						<c:set var="edittopic">
-							<html:rewrite
-								page="/authoring/editTopic.do?sessionMapID=${sessionMapID}&topicIndex=${topicIndex}&create=${topic.message.created.time}" />
-						</c:set>
-						<html:link href="${edittopic}" styleClass="button space-left">
-							<fmt:message key="label.edit" />
-						</html:link>
-						<BR>
-						<BR>
-					</td>
-				</tr>
-			</table>
-		</div>
+			</c:if>
+			<tr>
+				<td align="center">
+					<html:link href="javascript:window.parent.hideMessage()"
+						styleClass="button space-left">
+						<fmt:message key="button.cancel" />
+					</html:link>
+					<c:set var="deletetopic">
+						<html:rewrite
+							page="/authoring/deleteTopic.do?sessionMapID=${sessionMapID}&topicIndex=${topicIndex}" />
+					</c:set>
+					<html:link href="${deletetopic}" styleClass="button space-left">
+						<fmt:message key="label.delete" />
+					</html:link>
+					<c:set var="edittopic">
+						<html:rewrite
+							page="/authoring/editTopic.do?sessionMapID=${sessionMapID}&topicIndex=${topicIndex}&create=${topic.message.created.time}" />
+					</c:set>
+					<html:link href="${edittopic}" styleClass="button space-left">
+						<fmt:message key="label.edit" />
+					</html:link>
+
+				</td>
+			</tr>
+		</table>
+
 	</body>
 </html>