Index: lams_tool_chat/web/includes/css/chat.css
===================================================================
diff -u -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 -r53645c8d07fa71f2f23a362667a1bfc270bb4912
--- lams_tool_chat/web/includes/css/chat.css	(.../chat.css)	(revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929)
+++ lams_tool_chat/web/includes/css/chat.css	(.../chat.css)	(revision 53645c8d07fa71f2f23a362667a1bfc270bb4912)
@@ -15,7 +15,6 @@
 /* ==================== LEARNING PAGE STYLES ==================== */
 #chat_content {
 	width: 500 px;
-	padding: 12px;
 	/* compensate for content image border */
 	margin-left: 4px;
 }
@@ -27,7 +26,6 @@
 #iResp {
 	height: 260px;
 	margin-right: 12px;
-	margin-left: 12px;
 	overflow: scroll;
 	border-width: 1px;
 	border-style: solid;
@@ -58,7 +56,7 @@
 }
 
 #msgArea {
-	width: 410px;
+	width: 98%;
 }
 
 /* ================== MONITORING ================== */
Index: lams_tool_chat/web/pages/learning/learning.jsp
===================================================================
diff -u -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 -r53645c8d07fa71f2f23a362667a1bfc270bb4912
--- lams_tool_chat/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929)
+++ lams_tool_chat/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 53645c8d07fa71f2f23a362667a1bfc270bb4912)
@@ -40,39 +40,45 @@
 		<c:out value="${chatDTO.title}" escapeXml="false" />
 	</h1>
 
+	<p>
+		<c:out value="${chatDTO.instructions}" escapeXml="false" />
+	</p>
+	
 	<div id="chat_content">
 		<div id="chat_pane">
 			<form name="sendForm" action="" onSubmit="return sendMsg(this);">
 				<div>
-					<p>
-						<c:out value="${chatDTO.instructions}" escapeXml="false" />
-					</p>
 
+
 					<div id="roster"></div>
 					<div id="iResp">
 						<fmt:message>message.loading</fmt:message>
 					</div>
 
 					<br />
 
-					<h4 style="margin-left: 12px;">
+					<div class="field-name">
 						<fmt:message>label.sendMessageTo</fmt:message>
 						<span id="sendToEveryone"><fmt:message>label.everyone</fmt:message>
 						</span><span id="sendToUser" style="display: none"></span>
-					</h4>
+					</div>
 
 
-					<div style="margin-left: 12px;">
+					
 						<textarea name="msg" onKeyPress="return checkEnter(event);"
 							id="msgArea" rows="2" cols="20"></textarea>
-
+						
+						
+						<div class="space-top">
 						<input id="sendButton" class="button" type="submit"
 							value='<fmt:message>button.send</fmt:message>' />
-					</div>
+						</div>
+					
+					
 				</div>
 			</form>
 
-			<br />
+			
 			<c:if test="${MODE == 'learner' || MODE == 'author'}">
 				<%@ include file="parts/finishButton.jsp"%>
 
Index: lams_tool_chat/web/pages/learning/notebook.jsp
===================================================================
diff -u -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 -r53645c8d07fa71f2f23a362667a1bfc270bb4912
--- lams_tool_chat/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929)
+++ lams_tool_chat/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 53645c8d07fa71f2f23a362667a1bfc270bb4912)
@@ -6,29 +6,23 @@
 </h1>
 
 	<html:form action="/learning" method="post">
-		<table>
-			<tr>
-				<td>
-					<lams:out value="${chatDTO.reflectInstructions}"/>				
-				</td>
-			</tr>
-
-			<tr>
-				<td>
-					<html:textarea cols="60" rows="8" property="entryText"></html:textarea>
-				</td>
-			</tr>
-
-			<tr>
-				<td class="right-buttons">
+	
+					<p class="small-space-top"><lams:out value="${chatDTO.reflectInstructions}"/>
+					</p>			
+			
+					<html:textarea cols="60" rows="8" property="entryText" styleClass="text-area"></html:textarea>
+			
+			
+			<div align="right" class="space-bottom-top">
 					<html:hidden property="dispatch" value="submitReflection" />
 					<html:hidden property="chatUserUID" />
 					<html:submit styleClass="button">
 						<fmt:message>button.finish</fmt:message>
 					</html:submit>
-				</td>
-			</tr>
-		</table>
+		 </div>
+	
+		 
+		 
 	</html:form>
 </div>
 
Index: lams_tool_forum/web/jsps/authoring/advance.jsp
===================================================================
diff -u -re2752a42cc475f7524dc223c1fd712940c57b39a -r53645c8d07fa71f2f23a362667a1bfc270bb4912
--- lams_tool_forum/web/jsps/authoring/advance.jsp	(.../advance.jsp)	(revision e2752a42cc475f7524dc223c1fd712940c57b39a)
+++ lams_tool_forum/web/jsps/authoring/advance.jsp	(.../advance.jsp)	(revision 53645c8d07fa71f2f23a362667a1bfc270bb4912)
@@ -41,8 +41,7 @@
 </p>
 
 <p>
-	<html:checkbox property="forum.limitedInput" styleId="limitedInput"
-		styleClass="noBorder">
+	<html:checkbox property="forum.limitedInput" styleId="limitedInput"	styleClass="noBorder">
 	</html:checkbox>
 	<label for="limitedInput">
 		<fmt:message key="label.authoring.advance.limited.input" />
@@ -52,8 +51,7 @@
 </p>
 
 <p>
-	<html:checkbox property="forum.reflectOnActivity" styleClass="noBorder"
-		styleId="reflectOn">
+	<html:checkbox property="forum.reflectOnActivity" styleClass="noBorder"	styleId="reflectOn">
 	</html:checkbox>
 	<label for="reflectOn">
 		<fmt:message key="advanced.reflectOnActivity" />
@@ -72,7 +70,7 @@
 
 <p>
 	<html:radio property="forum.allowNewTopic" value="true"
-		onclick="allowNewTopic()" styleId="allowNewTopic1">
+		onclick="allowNewTopic()" styleId="allowNewTopic1" styleClass="noBorder">
 	</html:radio>
 	<label for="allowNewTopic1">
 		<fmt:message key="label.authoring.advance.allow.new.topics" />
@@ -81,7 +79,7 @@
 
 <p>
 	<html:radio property="forum.allowNewTopic" value="false"
-		onclick="allowNewTopic()" styleId="allowNewTopic2">
+		onclick="allowNewTopic()" styleId="allowNewTopic2" styleClass="noBorder">
 	</html:radio>
 	<label for="allowNewTopic2">
 		<fmt:message key="label.authoring.advance.number.reply" />
Index: lams_tool_forum/web/jsps/authoring/basic.jsp
===================================================================
diff -u -rf7f3ed3adecc6c94cd5500b1a21c78f5275ebfe5 -r53645c8d07fa71f2f23a362667a1bfc270bb4912
--- lams_tool_forum/web/jsps/authoring/basic.jsp	(.../basic.jsp)	(revision f7f3ed3adecc6c94cd5500b1a21c78f5275ebfe5)
+++ lams_tool_forum/web/jsps/authoring/basic.jsp	(.../basic.jsp)	(revision 53645c8d07fa71f2f23a362667a1bfc270bb4912)
@@ -18,7 +18,7 @@
 			area.src=url;
 			area.style.display="block";
 		}
-		document.getElementById("saveCancelButtons").style.display="none";
+		
 		var elem = document.getElementById("saveCancelButtons");
 		if (elem != null) {
 			elem.style.display="none";
Index: lams_tool_forum/web/jsps/learning/message/topiceditform.jsp
===================================================================
diff -u -rdcb83f95aa4dea687ccdf61672668086b712b9a0 -r53645c8d07fa71f2f23a362667a1bfc270bb4912
--- lams_tool_forum/web/jsps/learning/message/topiceditform.jsp	(.../topiceditform.jsp)	(revision dcb83f95aa4dea687ccdf61672668086b712b9a0)
+++ lams_tool_forum/web/jsps/learning/message/topiceditform.jsp	(.../topiceditform.jsp)	(revision 53645c8d07fa71f2f23a362667a1bfc270bb4912)
@@ -1,32 +1,35 @@
 <%@ include file="/includes/taglibs.jsp"%>
 
-<table cellpadding="0">
-	<tr>
-		<td>
-			<span  class="field-name"><fmt:message key="message.label.subject" /></span><BR>
-			<html:text size="30" tabindex="1" property="message.subject" />
+
+	
+			<div class="field-name title-space-top">
+				<fmt:message key="message.label.subject" />
+			</div>
+			
+			
+			<html:text size="50" tabindex="1" property="message.subject" />
 			<html:errors property="message.subject" />
-		</td>
-	</tr>
-	<tr>
-		<td>
-			<span  class="field-name"><fmt:message key="message.label.body" />*</span><BR>
+		
+			<div class="field-name title-space-top">
+				<fmt:message key="message.label.body" />*
+			</div>
+			
 			<%@include file="bodyarea.jsp"%>
-		</td>
-	</tr>
-	<c:if test="${topic.hasAttachment || sessionMap.allowUpload}">
-		<tr>
-			<td>
-				<span class="field-name"><fmt:message key="message.label.attachment" /></span>
+		
+			<c:if test="${topic.hasAttachment || sessionMap.allowUpload}">
+		
+				<div class="field-name title-space-top">
+					<fmt:message key="message.label.attachment" />
+				</div>
+				
 				<c:set var="allowUpload" value="${sessionMap.allowUpload}" />
+				
 				<div id="itemAttachmentArea">
 					<%@ include file="/jsps/learning/message/msgattachment.jsp"%>
 				</div>		
-			</td>
-		</tr>
+			
 	</c:if>
-		<tr>
-			<td>
+		<div class="space-bottom-top">
 <div class="right-buttons">
 			<html:submit styleClass="button">
 				<fmt:message key="button.submit" />
@@ -37,7 +40,6 @@
 			<html:button property="goback" onclick="javascript:location.href='${backToTopic}';" styleClass="button">
 				<fmt:message key="button.cancel" />
 			</html:button>
-			</td>
-		</tr>
+			
 </div>
-</table>
+</div>
Index: lams_tool_forum/web/jsps/learning/message/topiclist.jsp
===================================================================
diff -u -reb9c343e0a5d441b32fc35cb034a621525ead82d -r53645c8d07fa71f2f23a362667a1bfc270bb4912
--- lams_tool_forum/web/jsps/learning/message/topiclist.jsp	(.../topiclist.jsp)	(revision eb9c343e0a5d441b32fc35cb034a621525ead82d)
+++ lams_tool_forum/web/jsps/learning/message/topiclist.jsp	(.../topiclist.jsp)	(revision 53645c8d07fa71f2f23a362667a1bfc270bb4912)
@@ -1,24 +1,24 @@
 <%@ include file="/includes/taglibs.jsp"%>
 
-<table cellpadding="0" class="alternative-color">
+<table cellpadding="0" class="alternative-color" cellspacing="0">
 	<tbody>
 		<tr>
-			<th width="250">
+			<th width="">
 				<fmt:message key="lable.topic.title.subject" />
 			</th>
-			<th width="90">
+			<th width="100px">
 				<fmt:message key="lable.topic.title.startedby" />
 			</th>
-			<th width="70">
+			<th width="60px">
 				<fmt:message key="lable.topic.title.replies" />
 			</th>
-			<th>
+			<th width="25%">
 				<fmt:message key="lable.topic.title.update" />
 			</th>
 		</tr>
 		<c:forEach items="${topicList}" var="topic">
 			<tr>
-				<td class="first">
+				<td>
 					<c:set var="viewtopic">
 						<html:rewrite page="/learning/viewTopic.do?sessionMapID=${sessionMapID}&topicID=${topic.message.uid}&create=${topic.message.created.time}" />
 					</c:set>
@@ -29,7 +29,7 @@
 						<img src="<html:rewrite page="/images/paperclip.gif"/>">
 					</c:if>
 				</td>
-				<td class="first">
+				<td>
 					<c:set var="author" value="${topic.author}"/>
 					<c:if test="${empty author}">
 						<c:set var="author">
@@ -38,7 +38,7 @@
 					</c:if>
 					${author}
 				</td>
-				<td>
+				<td  align="center">
 					<c:out value="${topic.message.replyNumber}" />
 				</td>
 				<td>
Index: lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp
===================================================================
diff -u -rdcb83f95aa4dea687ccdf61672668086b712b9a0 -r53645c8d07fa71f2f23a362667a1bfc270bb4912
--- lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp	(.../topicreplyform.jsp)	(revision dcb83f95aa4dea687ccdf61672668086b712b9a0)
+++ lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp	(.../topicreplyform.jsp)	(revision 53645c8d07fa71f2f23a362667a1bfc270bb4912)
@@ -1,41 +1,42 @@
 <%@ include file="/includes/taglibs.jsp"%>
 
-<table cellpadding="0">
-	<tr>
-		<td>
-			<span  class="field-name"><fmt:message key="message.label.subject" /></span><BR>		
-			<html:text size="30" tabindex="1" property="message.subject" />
-			<html:errors property="message.subject" />
-		</td>
-	</tr>
-	<tr>
-		<td>
-			<span  class="field-name"><fmt:message key="message.label.body" />*</span><BR>		
-			<%@include file="bodyarea.jsp"%>
-		</td>
-	</tr>
-	<c:if test="${sessionMap.allowUpload}">
-		<tr>
-			<td>
-				<span class="field-name"><fmt:message key="message.label.attachment" /></span>
-				<html:file tabindex="3" property="attachmentFile" />
-				<html:errors property="message.attachment" />
-			</td>
-		</tr>
-	</c:if>
-		<tr>
-			<td>
+
+		<div class="field-name title-space-top">
+			<fmt:message key="message.label.subject" />
+		</div>
+		
+		
+		<html:text size="30" tabindex="1" property="message.subject" />
+		<html:errors property="message.subject" />
+		
+		<div class="field-name title-space-top">
+			<fmt:message key="message.label.body" />
+			*
+		</div>
+		<%@include file="bodyarea.jsp"%>
+		
+		<c:if test="${sessionMap.allowUpload}">
+		
+			<div class="field-name title-space-top">
+				<fmt:message key="message.label.attachment" />
+			</div>
+			<html:file tabindex="3" property="attachmentFile" />
+			<html:errors property="message.attachment" />
+		
+		</c:if>
+		<div class="space-bottom-top">
 		<div class="right-buttons">
 			<html:submit styleClass="button">
 				<fmt:message key="button.submit" />
 			</html:submit>
 			<c:set var="backToTopic">
-				<html:rewrite page="/learning/viewTopic.do?sessionMapID=${sessionMapID}&topicID=${sessionMap.rootUid}&create=${message.created.time}" />
+				<html:rewrite
+					page="/learning/viewTopic.do?sessionMapID=${sessionMapID}&topicID=${sessionMap.rootUid}&create=${message.created.time}" />
 			</c:set>
-			<html:button property="goback" onclick="javascript:location.href='${backToTopic}';" styleClass="button">
+			<html:button property="goback"
+				onclick="javascript:location.href='${backToTopic}';"
+				styleClass="button">
 				<fmt:message key="button.cancel" />
 			</html:button>
 		</div>
-			</td>
-		</tr>
-</table>
+		</div>
Index: lams_tool_forum/web/jsps/learning/message/topicview.jsp
===================================================================
diff -u -reb9c343e0a5d441b32fc35cb034a621525ead82d -r53645c8d07fa71f2f23a362667a1bfc270bb4912
--- lams_tool_forum/web/jsps/learning/message/topicview.jsp	(.../topicview.jsp)	(revision eb9c343e0a5d441b32fc35cb034a621525ead82d)
+++ lams_tool_forum/web/jsps/learning/message/topicview.jsp	(.../topicview.jsp)	(revision 53645c8d07fa71f2f23a362667a1bfc270bb4912)
@@ -6,7 +6,7 @@
 	<div style="margin-left:<c:out value="${indentSize}"/>em;">
 		<table cellspacing="0" class="forum">
 			<tr>
-				<th class="first">
+				<th>
 					<c:choose>
 						<c:when test='${(sessionMap.mode == "teacher") || (not hidden)}'>
 							<c:out value="${msgDto.message.subject}" />
@@ -18,7 +18,7 @@
 				</th>
 			</tr>
 			<tr>
-				<td class="first posted-by">
+				<td class="posted-by">
 					<c:if test='${(sessionMap.mode == "teacher") || (not hidden)}'>
 						<fmt:message key="lable.topic.subject.by" />
 						<c:set var="author" value="${msgDto.author}" />
@@ -138,9 +138,7 @@
 								</html:link>
 							</c:if>
 						</c:if>
-					</div>
-
-					<div class="right-buttons">
+					
 						<!--  Reply Button -->
 						<c:if
 							test="${(not sessionMap.finishedLock) && (not sessionMap.noMorePosts)}">
Index: lams_tool_forum/web/jsps/learning/notebook.jsp
===================================================================
diff -u -re32edf3f59266506e8fdbd10f7b61175111fc4dc -r53645c8d07fa71f2f23a362667a1bfc270bb4912
--- lams_tool_forum/web/jsps/learning/notebook.jsp	(.../notebook.jsp)	(revision e32edf3f59266506e8fdbd10f7b61175111fc4dc)
+++ lams_tool_forum/web/jsps/learning/notebook.jsp	(.../notebook.jsp)	(revision 53645c8d07fa71f2f23a362667a1bfc270bb4912)
@@ -1,42 +1,34 @@
 <%@ include file="/common/taglibs.jsp"%>
-<c:set var="sessionMapID" value="${param.sessionMapID}"/>
-<c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
+<c:set var="sessionMapID" value="${param.sessionMapID}" />
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 
 
 <html:form action="/learning/submitReflection" method="post">
 	<html:hidden property="userID" />
-	<html:hidden property="sessionMapID"/>
-	
+	<html:hidden property="sessionMapID" />
+
 	<div id="content">
-	<h1>
-		${sessionMap.title}
-	</h1>
-			<table>
-				<tr>
-					<td>
-						<%@ include file="/common/messages.jsp"%>
-					</td>
-				</tr>
-				<tr>
-					<td>
-						<lams:out value="${sessionMap.reflectInstructions}"/>
-					</td>
-				</tr>
-	
-				<tr>
-					<td>
-						<html:textarea cols="60" rows="8" property="entryText"/>
-					</td>
-				</tr>
-	
-				<tr>
-					<td class="right-buttons">
-						<html:submit styleClass="button">
-							<fmt:message key="label.finish"/>
-						</html:submit>
-					</td>
-				</tr>
-			</table>
+		<h1>
+			${sessionMap.title}
+		</h1>
+
+		<%@ include file="/common/messages.jsp"%>
+
+
+		<p>
+			<lams:out value="${sessionMap.reflectInstructions}" />
+		</p>
+
+		<html:textarea cols="52" rows="6" property="entryText" styleClass="text-area" />
+
+		<div class="space-bottom-top">
+			<div class="right-buttons">
+			<html:submit styleClass="button">
+				<fmt:message key="label.finish" />
+			</html:submit>
+			</div>
+		</div>
+
 	</div>
 </html:form>
 
Index: lams_tool_forum/web/jsps/learning/viewforum.jsp
===================================================================
diff -u -r64ef89247b8a1055e73517892fec7ace24a5b9a7 -r53645c8d07fa71f2f23a362667a1bfc270bb4912
--- lams_tool_forum/web/jsps/learning/viewforum.jsp	(.../viewforum.jsp)	(revision 64ef89247b8a1055e73517892fec7ace24a5b9a7)
+++ lams_tool_forum/web/jsps/learning/viewforum.jsp	(.../viewforum.jsp)	(revision 53645c8d07fa71f2f23a362667a1bfc270bb4912)
@@ -1,79 +1,89 @@
 <%@ include file="/common/taglibs.jsp"%>
-<c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 
+<div id="content">
 
+	<h1>
+		<c:out value="${sessionMap.title}" escapeXml="false" />
+	</h1>
 
 
-<div id="content">
+	<div class="small-space-top">
 
-<h1>
-	<c:out value="${sessionMap.title}" escapeXml="false" />
-</h1>
+		<c:out value="${sessionMap.instruction}" escapeXml="false" />
 
-	<table>
-		<tr>
-			<td>
-				<c:out value="${sessionMap.instruction}" escapeXml="false" />
-			</td>
-		</tr>
-		<tr>
-			<td>
-				<%@ include file="/common/messages.jsp"%>
-			</td>
-		</tr>
-	</table>
+		</div>
+		
+		<%@ include file="/common/messages.jsp"%>
 
-	<%@ include file="/jsps/learning/message/topiclist.jsp"%>
+		
 
-	<table>
+			<%@ include file="/jsps/learning/message/topiclist.jsp"%>
 
-		<tr>
-			<td>
 
-				<c:set var="newtopic">
-					<html:rewrite page="/learning/newTopic.do?sessionMapID=${sessionMapID}" />
-				</c:set>
-				<c:set var="refresh">
-					<html:rewrite page="/learning/viewForum.do?mode=${sessionMap.mode}&toolSessionID=${sessionMap.toolSessionID}&sessionMapID=${sessionMapID}" />
-				</c:set>
-				<c:set var="continue">
-					<html:rewrite page="/learning/newReflection.do?sessionMapID=${sessionMapID}" />
-				</c:set>
-				<c:set var="finish">
-					<html:rewrite page="/learning/finish.do?sessionMapID=${sessionMapID}" />
-				</c:set>
+			<c:set var="newtopic">
+				<html:rewrite
+					page="/learning/newTopic.do?sessionMapID=${sessionMapID}" />
+			</c:set>
+			<c:set var="refresh">
+				<html:rewrite
+					page="/learning/viewForum.do?mode=${sessionMap.mode}&toolSessionID=${sessionMap.toolSessionID}&sessionMapID=${sessionMapID}" />
+			</c:set>
+			<c:set var="continue">
+				<html:rewrite
+					page="/learning/newReflection.do?sessionMapID=${sessionMapID}" />
+			</c:set>
+			<c:set var="finish">
+				<html:rewrite
+					page="/learning/finish.do?sessionMapID=${sessionMapID}" />
+			</c:set>
 
-				<div class="left-buttons">
-					<c:if test='${sessionMap.mode != "teacher" && sessionMap.allowNewTopics}'>
-						<html:button property="newtopic" onclick="javascript:location.href='${newtopic}';" disabled="${sessionMap.finishedLock}" styleClass="button">
-							<fmt:message key="label.newtopic" />
-						</html:button>
-					</c:if>
-					<html:button property="refresh" onclick="javascript:location.href='${refresh}';" styleClass="button">
-						<fmt:message key="label.refresh" />
+
+
+			<div style="float:right">
+				<c:if test='${sessionMap.mode != "teacher"}'>
+					<c:choose>
+						<c:when
+							test="${sessionMap.reflectOn && (not sessionMap.finishedLock)}">
+							<html:button property="continue"
+								onclick="javascript:location.href='${continue}';"
+								styleClass="button">
+								<fmt:message key="label.continue" />
+							</html:button>
+						</c:when>
+						<c:otherwise>
+							<html:button property="finish"
+								onclick="javascript:location.href='${finish}';"
+								styleClass="button">
+								<fmt:message key="label.finish" />
+							</html:button>
+						</c:otherwise>
+					</c:choose>
+				</c:if>
+
+
+
+			</div>
+
+
+			<div class="space-bottom">
+				<c:if	test='${sessionMap.mode != "teacher" && sessionMap.allowNewTopics}'>
+					<html:button property="newtopic"
+						onclick="javascript:location.href='${newtopic}';"
+						disabled="${sessionMap.finishedLock}" styleClass="button">
+						<fmt:message key="label.newtopic" />
 					</html:button>
-				</div>
+				</c:if>
+				<html:button property="refresh"
+					onclick="javascript:location.href='${refresh}';"
+					styleClass="button">
+					<fmt:message key="label.refresh" />
+				</html:button>
 
-				<div class="right-buttons">
+			</div>
 
-					<c:if test='${sessionMap.mode != "teacher"}'>
-						<c:choose>
-							<c:when test="${sessionMap.reflectOn && (not sessionMap.finishedLock)}">
-								<html:button property="continue" onclick="javascript:location.href='${continue}';" styleClass="button">
-									<fmt:message key="label.continue" />
-								</html:button>
-							</c:when>
-							<c:otherwise>
-								<html:button property="finish" onclick="javascript:location.href='${finish}';" styleClass="button">
-									<fmt:message key="label.finish" />
-								</html:button>
-							</c:otherwise>
-						</c:choose>
-					</c:if>
-				</div>
-			</td>
-		</tr>
-	</table>
-</div>
 
 
+
+
+		</div>
\ No newline at end of file
Index: lams_tool_forum/web/jsps/learning/viewtopic.jsp
===================================================================
diff -u -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 -r53645c8d07fa71f2f23a362667a1bfc270bb4912
--- lams_tool_forum/web/jsps/learning/viewtopic.jsp	(.../viewtopic.jsp)	(revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929)
+++ lams_tool_forum/web/jsps/learning/viewtopic.jsp	(.../viewtopic.jsp)	(revision 53645c8d07fa71f2f23a362667a1bfc270bb4912)
@@ -1,5 +1,5 @@
 <%@ include file="/common/taglibs.jsp"%>
-<c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 
 <script type="text/javascript">
 	function refreshTopic(){
@@ -11,36 +11,39 @@
 
 <div id="content">
 
-<h1>
-	${sessionMap.title}
-</h1>
+	<h1>
+		${sessionMap.title}
+	</h1>
+<div>
+	
 
-	<h2>
-
-		<fmt:message key="title.message.view.topic" />
-	</h2>
-
-	<p>
+	<div class="right-buttons">
 		<c:set var="backToForum">
-			<html:rewrite page="/learning/viewForum.do?mode=${sessionMap.mode}&sessionMapID=${sessionMapID}&toolSessionID=${sessionMap.toolSessionID}" />
+			<html:rewrite
+				page="/learning/viewForum.do?mode=${sessionMap.mode}&sessionMapID=${sessionMapID}&toolSessionID=${sessionMap.toolSessionID}" />
 		</c:set>
-		<html:button property="backToForum" onclick="javascript:location.href='${backToForum}';" styleClass="button">
+		<html:button property="backToForum" onclick="javascript:location.href='${backToForum}';"
+			styleClass="button" >
 			<fmt:message key="label.back.to.forum" />
 		</html:button>
-	</p>
-	<%@ include file="message/topicview.jsp"%>
-	<table>
-	<tr><td>
-	<div class="left-buttons">
-		<c:set var="refreshTopicURL">
-			
-		</c:set>
-		<a href="javascript:refreshTopic();" class="button">
-			<fmt:message key="label.refresh"/>
-		</a>
+		
+		</div>
+		
+		<h2>
+
+		<fmt:message key="title.message.view.topic" />
+	</h2>	
+
 	</div>
-	</td></tr>
-	</table>
-</div>
 
 
+	<%@ include file="message/topicview.jsp"%>
+	<c:set var="refreshTopicURL">
+
+	</c:set>
+
+	<div class="space-bottom-top">
+		<a href="javascript:refreshTopic();" class="button"> <fmt:message
+				key="label.refresh" /> </a>
+	</div>
+</div>