Index: lams_tool_forum/web/common/header.jsp
===================================================================
diff -u -r5e63656a12c02f7476564e278b43ff4ce86ac930 -rd3a9876dc1ffb96feebcd861473dd3339e83966e
--- lams_tool_forum/web/common/header.jsp	(.../header.jsp)	(revision 5e63656a12c02f7476564e278b43ff4ce86ac930)
+++ lams_tool_forum/web/common/header.jsp	(.../header.jsp)	(revision d3a9876dc1ffb96feebcd861473dd3339e83966e)
@@ -13,4 +13,7 @@
 <script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/prototype.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>
-<script type="text/javascript" src="${tool}includes/javascript/message.js"></script>
\ No newline at end of file
+<script type="text/javascript" src="${tool}includes/javascript/message.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script> 
+<script type="text/javascript" src="${lams}includes/javascript/jquery.timeago.js"></script>
\ No newline at end of file
Index: lams_tool_forum/web/jsps/learning/message/bodyarea.jsp
===================================================================
diff -u -r77b465e1c7a15302b050e865522af9cbba85c11d -rd3a9876dc1ffb96feebcd861473dd3339e83966e
--- lams_tool_forum/web/jsps/learning/message/bodyarea.jsp	(.../bodyarea.jsp)	(revision 77b465e1c7a15302b050e865522af9cbba85c11d)
+++ lams_tool_forum/web/jsps/learning/message/bodyarea.jsp	(.../bodyarea.jsp)	(revision d3a9876dc1ffb96feebcd861473dd3339e83966e)
@@ -12,7 +12,7 @@
 		
 		<c:otherwise>
 			<%-- Does not user general tag because this field need keep compatible with CKEditor's content --%>
-			<lams:STRUTS-textarea rows="10" cols="60" tabindex="2" property="message.body"/> 
+			<lams:STRUTS-textarea rows="10" styleClass="form-control" tabindex="2" property="message.body"/> 
 		</c:otherwise>
 	</c:choose>
 	<BR/>
Index: lams_tool_forum/web/jsps/learning/message/msgview.jsp
===================================================================
diff -u -rd5fee901f5527e516add11b0ec872521de171133 -rd3a9876dc1ffb96feebcd861473dd3339e83966e
--- lams_tool_forum/web/jsps/learning/message/msgview.jsp	(.../msgview.jsp)	(revision d5fee901f5527e516add11b0ec872521de171133)
+++ lams_tool_forum/web/jsps/learning/message/msgview.jsp	(.../msgview.jsp)	(revision d3a9876dc1ffb96feebcd861473dd3339e83966e)
@@ -1,74 +1,75 @@
 <%@ page import="org.lamsfoundation.lams.tool.forum.util.ForumConstants"%>
 <%@ include file="/common/taglibs.jsp"%>
 
+<script type="text/javascript" src="<lams:LAMSURL />/includes/javascript/jquery.timeago.js"></script>
+
 <%--  msgDto, messageUid, msgLevel needs to be in the session elsewhere --%>
 
-	<c:set var="hidden" value="${msgDto.message.hideFlag}" />
-	
-	<c:choose>
+<c:set var="hidden" value="${msgDto.message.hideFlag}" />
+
+<c:choose>
 	<c:when test='${msgDto.message.uid == messageUid}'>
 		<c:set var="highlightClass">highlight</c:set>
 	</c:when>
-	<c:otherwise>	
+	<c:otherwise>
 		<c:set var="highlightClass"></c:set>
-	</c:otherwise> 
-	</c:choose>
-	
-	<%--  outermsg${msgDto.message.uid} is used to replace existing message areas when a message is edited. --%>
-	<c:choose>
+	</c:otherwise>
+</c:choose>
+
+<%--  outermsg${msgDto.message.uid} is used to replace existing message areas when a message is edited. --%>
+<c:choose>
 	<c:when test='${(msgDto.level <= 1)}'>
 		<div class="row no-gutter voffset5">
-    	<div class="col-xs-12" id="outermsg${msgDto.message.uid}">
+			<div class="col-xs-12" id="outermsg${msgDto.message.uid}">
 	</c:when>
 	<c:otherwise>
 		<div class="no-gutter voffset2">
-    	<div style="margin-left:<c:out value="${(msgDto.level-1)*indent}"/>px;"  id="outermsg${msgDto.message.uid}">
+			<div style="margin-left:<c:out value="${(msgDto.level-1)*indent}"/>px;" id="outermsg${msgDto.message.uid}">
 	</c:otherwise>
-	</c:choose>
+</c:choose>
 
-      <div class="panel panel-default ${highlightClass} msg" id="msg${msgDto.message.uid}">
-        <div class="panel-heading">
-        <h4 class="panel-title">
-        	<span style="float:right">
-			<i class="fa fa-user"></i> 
-			<c:if test='${(sessionMap.mode == "teacher") || (not hidden)}'>
-				<c:set var="author" value="${msgDto.author}" />
-				<c:if test="${empty author}">
-					<c:set var="author"><fmt:message key="label.default.user.name" /></c:set>
-				</c:if>
-				<span id="author"><c:out value="${author}" escapeXml="true"/></span>						
+<div class="panel panel-default ${highlightClass} msg" id="msg${msgDto.message.uid}">
+	<div class="panel-heading">
+		<h4 class="panel-title">
+			<span style="float: right"> <i class="fa fa-xs fa-user"></i> <c:if
+					test='${(sessionMap.mode == "teacher") || (not hidden)}'>
+					<c:set var="author" value="${msgDto.author}" />
+					<c:if test="${empty author}">
+						<c:set var="author">
+							<fmt:message key="label.default.user.name" />
+						</c:set>
+					</c:if>
+					<span id="author"><c:out value="${author}" escapeXml="true" /></span>						
 				-
-				<span id="date"><lams:Date value="${msgDto.message.updated}" /></span>
-			</c:if>
+				<time class="timeago" datetime="<fmt:formatDate value='${msgDto.message.updated}' pattern="yyyy-MM-dd'T'HH:mm:ss.S'Z'"/>"><lams:Date value="${msgDto.message.updated}" /></time>
+				</c:if>
 			</span>
 			<c:choose>
-			<c:when test='${(sessionMap.mode == "teacher") || (not hidden)}'>
-				<c:out value="${msgDto.message.subject}" />
-			</c:when>
-			<c:otherwise>
+				<c:when test='${(sessionMap.mode == "teacher") || (not hidden)}'>
+					<c:out value="${msgDto.message.subject}" />
+				</c:when>
+				<c:otherwise>
 				&nbsp;<fmt:message key="topic.message.subject.hidden" />
-			</c:otherwise>
+				</c:otherwise>
 			</c:choose>
 		</h4>
-		</div>
-		
-		<div class="panel-body" id="pb-msg${msgDto.message.uid}">
-			<span>
-			<c:if test='${(not hidden) || (hidden && sessionMap.mode == "teacher")}'>
+	</div>
+
+	<div class="panel-body" id="pb-msg${msgDto.message.uid}">
+		<span> <c:if test='${(not hidden) || (hidden && sessionMap.mode == "teacher")}'>
 				<c:out value="${msgDto.message.body}" escapeXml="false" />
-			</c:if>
-			<c:if test='${hidden}'>
+			</c:if> <c:if test='${hidden}'>
 				&nbsp;<em><fmt:message key="topic.message.body.hidden" /> </em>
 			</c:if>
-			</span>
+		</span>
 
-			<c:if test="${not empty msgDto.message.attachments}">
+		<c:if test="${not empty msgDto.message.attachments}">
 			<div id="attachments${msgDto.message.uid}" class="attachments">
 				<i class="fa fa-paperclip"></i>
-				<c:if test='${(not hidden) || (hidden && sessionMap.mode == "teacher")}'> 
+				<c:if test='${(not hidden) || (hidden && sessionMap.mode == "teacher")}'>
 					<c:forEach var="file" items="${msgDto.message.attachments}">
 						<c:set var="downloadURL">
-						<html:rewrite page="/download/?uuid=${file.fileUuid}&versionID=${file.fileVersionId}&preferDownload=true" />
+							<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>
@@ -77,14 +78,14 @@
 					&nbsp;<em><fmt:message key="topic.message.attachment.hidden" /></em>
 				</c:if>
 			</div>
-			</c:if>
-			
-			<c:if test="${((msgDto.released && msgDto.isAuthor) || sessionMap.mode=='teacher') && (not empty msgDto.mark)}">
-				<hr class="msg-hr">
-				<div>
-			    <span class="label label-default"><fmt:message key="lable.topic.title.mark" />&nbsp;</span>
-			    <fmt:formatNumber value="${msgDto.mark}"  maxFractionDigits="2"/><BR/>
-			    <span class="label label-default"><fmt:message key="lable.topic.title.comment" />&nbsp;</span>
+		</c:if>
+
+		<c:if test="${((msgDto.released && msgDto.isAuthor) || sessionMap.mode=='teacher') && (not empty msgDto.mark)}">
+			<hr class="msg-hr">
+			<div>
+				<span class="label label-default"><fmt:message key="lable.topic.title.mark" />&nbsp;</span>
+				<fmt:formatNumber value="${msgDto.mark}" maxFractionDigits="2" />
+				<BR /> <span class="label label-default"><fmt:message key="lable.topic.title.comment" />&nbsp;</span>
 				<c:choose>
 					<c:when test="${empty msgDto.comment}">
 						<fmt:message key="message.not.avaliable" />
@@ -93,39 +94,48 @@
 						<c:out value="${msgDto.comment}" escapeXml="false" />
 					</c:otherwise>
 				</c:choose>
-				</div>
-			</c:if>
+			</div>
+		</c:if>
 
-			<hr class="msg-hr">
-          	<div class="msg-footer">
+		<hr class="msg-hr">
+		<div class="msg-footer">
 
 			<!--  Rating stars -->
 			<%@ include file="/jsps/learning/ratingStars.jsp"%>
 
 			<!--  Hide/Unhide Button -->
 			<c:if test='${sessionMap.mode == "teacher"}'>
 				<c:set var="updateMark">
-					<html:rewrite page="/monitoring/editMark.do?sessionMapID=${sessionMapID}&topicID=${msgDto.message.uid}&updateMode=viewForum&hideReflection=${sessionMap.hideReflection}" />
+					<html:rewrite
+						page="/monitoring/editMark.do?sessionMapID=${sessionMapID}&topicID=${msgDto.message.uid}&updateMode=viewForum&hideReflection=${sessionMap.hideReflection}" />
 				</c:set>
-				<html:link href="${updateMark}" styleClass="comment"><fmt:message key="lable.topic.title.mark" /></html:link>
+				<html:link href="${updateMark}" styleClass="comment">
+					<fmt:message key="lable.topic.title.mark" />
+				</html:link>
 				&middot;
 							
 				<!--  call the hide action -->
 				<c:choose>
-				<c:when test="${hidden}">
-					<!--  display a show link  -->
-					<c:set var="hidetopic">
-						<html:rewrite page="/learning/updateMessageHideFlag.do?sessionMapID=${sessionMapID}&topicID=${msgDto.message.uid}&hideFlag=false" />
-					</c:set>
-					<html:link href="${hidetopic}" styleClass="comment"><fmt:message key="label.show" /></html:link>
-				</c:when>
-				<c:otherwise>
-					<!--  display a hide link -->
-					<c:set var="hidetopic">
-						<html:rewrite page="/learning/updateMessageHideFlag.do?sessionMapID=${sessionMapID}&topicID=${msgDto.message.uid}&hideFlag=true" />
-					</c:set>
-					<html:link href="${hidetopic}" styleClass="comment"><fmt:message key="label.hide" /></html:link>
-				</c:otherwise>
+					<c:when test="${hidden}">
+						<!--  display a show link  -->
+						<c:set var="hidetopic">
+							<html:rewrite
+								page="/learning/updateMessageHideFlag.do?sessionMapID=${sessionMapID}&topicID=${msgDto.message.uid}&hideFlag=false" />
+						</c:set>
+						<html:link href="${hidetopic}" styleClass="comment">
+							<fmt:message key="label.show" />
+						</html:link>
+					</c:when>
+					<c:otherwise>
+						<!--  display a hide link -->
+						<c:set var="hidetopic">
+							<html:rewrite
+								page="/learning/updateMessageHideFlag.do?sessionMapID=${sessionMapID}&topicID=${msgDto.message.uid}&hideFlag=true" />
+						</c:set>
+						<html:link href="${hidetopic}" styleClass="comment">
+							<fmt:message key="label.hide" />
+						</html:link>
+					</c:otherwise>
 				</c:choose>
 				&middot;
 			</c:if>
@@ -136,24 +146,30 @@
 					<html:rewrite
 						page="/learning/newReplyTopic.do?sessionMapID=${sessionMapID}&parentID=${msgDto.message.uid}&rootUid=${sessionMap.rootUid}&hideReflection=${sessionMap.hideReflection}" />
 				</c:set>
-				<a href="#${msgDto.message.uid}" onClick="javascript:createReply(${msgDto.message.uid},'${replytopic}',${msgLevel})" class="comment"><fmt:message key="label.reply" /></a>
+				<a href="#${msgDto.message.uid}" onClick="javascript:createReply(${msgDto.message.uid},'${replytopic}',${msgLevel})"
+					class="comment"><fmt:message key="label.reply" /></a>
 				&middot;
 			</c:if>
-			
+
 			<!--  Edit Button -->
 			<c:if test="${not hidden}">
-				<c:if test='${(sessionMap.mode == "teacher") || (msgDto.isAuthor && not sessionMap.finishedLock && sessionMap.allowEdit && (empty msgDto.mark))}'>
+				<c:if
+					test='${(sessionMap.mode == "teacher") || (msgDto.isAuthor && not sessionMap.finishedLock && sessionMap.allowEdit && (empty msgDto.mark))}'>
 					<c:set var="edittopic">
 						<html:rewrite
 							page="/learning/editTopic.do?sessionMapID=${sessionMapID}&topicID=${msgDto.message.uid}&rootUid=${sessinoMap.rootUid}&create=${msgDto.message.created.time}&hideReflection=${sessionMap.hideReflection}" />
 					</c:set>
-					<a href="#${msgDto.message.uid}" onClick="javascript:createEdit(${msgDto.message.uid},'${edittopic}',${msgLevel})" class="comment"><fmt:message key="label.edit" /></a>
+					<a href="#${msgDto.message.uid}" onClick="javascript:createEdit(${msgDto.message.uid},'${edittopic}',${msgLevel})"
+						class="comment"><fmt:message key="label.edit" /></a>
 				</c:if>
-			</c:if>			
-			
+			</c:if>
+
+		</div>
 	</div>
-	</div>
-	</div>
-	</div>
-	</div>
+</div>
 
+<script type="text/javascript">
+		jQuery(document).ready(function() {
+			jQuery("time.timeago").timeago();
+		});
+	</script>
Index: lams_tool_forum/web/jsps/learning/message/topiclist.jsp
===================================================================
diff -u -rd5fee901f5527e516add11b0ec872521de171133 -rd3a9876dc1ffb96feebcd861473dd3339e83966e
--- lams_tool_forum/web/jsps/learning/message/topiclist.jsp	(.../topiclist.jsp)	(revision d5fee901f5527e516add11b0ec872521de171133)
+++ lams_tool_forum/web/jsps/learning/message/topiclist.jsp	(.../topiclist.jsp)	(revision d3a9876dc1ffb96feebcd861473dd3339e83966e)
@@ -1,102 +1,83 @@
 <%@ page import="org.lamsfoundation.lams.tool.forum.util.ForumConstants"%>
 <%@ include file="/common/taglibs.jsp"%>
 
-<c:set var="pageSize" value="<%= ForumConstants.DEFAULT_PAGE_SIZE %>"/>
+<script type="text/javascript" src="<lams:LAMSURL />/includes/javascript/jquery.timeago.js"></script>
+
+<c:set var="pageSize" value="<%=ForumConstants.DEFAULT_PAGE_SIZE%>" />
 <div class="panel panel-default">
-	<div class="panel-heading panel-title"><fmt:message key="label.topics"/></div>
-	<div class="panel-body">
-		<html:button property="refresh" onclick="javascript:location.href='${refresh}';" styleClass="btn btn-sm btn-default voffset5 pull-left">
-			<fmt:message key="label.refresh" />
-		</html:button>
+	<div class="panel-heading panel-title">
+		<fmt:message key="label.topics" />
 
-		<c:set var="disabled" value="" />
-		<c:if test="${sessionMap.finishedLock}">
-			<c:set var="disabled" value="disabled" />
-		</c:if>
+		<div class="btn-group pull-right">
+			<a href="javascript:location.href='${refresh}';" type="button" class="btn btn-xs btn-default"><i class="fa fa-xm fa-refresh"></i>
+				<fmt:message key="label.refresh" /></a>
 
-		<c:if test='${sessionMap.allowNewTopics}'>
-			<html:button property="newtopic"
-				onclick="javascript:location.href='${newtopic}';"
-				disabled="${sessionMap.finishedLock}" styleClass="btn btn-sm btn-default voffset5 ${buttonClass} pull-right">
-				<fmt:message key="label.newtopic" />
-			</html:button>
-		</c:if>
-	</div>
-	<div class="table-responsive">
-	<table  id="topicTable" class="table">
-		<thead>
-		<tr>
-			<th width="">
-				<fmt:message key="lable.topic.title.subject" />
-			</th>
-			<th width="15%">
-				<fmt:message key="lable.topic.title.startedby" />
-			</th>
-			<th width="8%">
-				<fmt:message key="lable.topic.title.replies" />
-			</th>
-			<th width="8%">
-				<fmt:message key="lable.topic.title.repliesnew" />
-			</th>
-			<th width="20%">
-				<fmt:message key="lable.topic.title.update" />
-			</th>
-			<c:if test="${not sessionMap.allowNewTopics and sessionMap.minimumReply ne 0}">
-				<th  width="8%">
-					&nbsp;
-				</th>
+			<c:if test='${sessionMap.allowNewTopics}'>
+				<a href="javascript:location.href='${newtopic}';" type="button" class="btn btn-xs btn-default"> <i
+					class="fa fa-xm fa-plus"></i> <fmt:message key="label.newtopic" /></a>
 			</c:if>
-		</tr>
-		</thead>
-		<tbody>
-		<c:forEach items="${topicList}" var="topic">
-			<tr>
-				<td>
-					<c:set var="viewtopic">
-						<html:rewrite page="/learning/viewTopic.do?sessionMapID=${sessionMapID}&topicID=${topic.message.uid}&create=${topic.message.created.time}&hideReflection=${sessionMap.hideReflection}&pageLastId=0&size=${pageSize}" />
-					</c:set>
-					<html:link href="${viewtopic}" styleId="topicTitle">
-						<c:choose>
-							<c:when test="${topic.newPostingsNum > 0}">
-								<b><c:out value="${topic.message.subject}" /></b>
-							</c:when>
-							<c:otherwise>
-								<c:out value="${topic.message.subject}" />
-							</c:otherwise>
-						</c:choose>
-					</html:link>
-					<c:if test="${topic.hasAttachment}">
-						<i class="fa fa-paperclip"></i>
-					</c:if>
-				</td>
-				<td>
-					<c:set var="author" value="${topic.author}"/>
-					<c:if test="${empty author}">
-						<c:set var="author">
-							<fmt:message key="label.default.user.name"/>
-						</c:set>
-					</c:if>
-					<c:out value="${author}" escapeXml="true"/>
-				</td>
-				
-				<td align="center">
-					<c:out value="${topic.message.replyNumber}" />
-				</td>
-				
-				<td align="center">
-					<c:out value="${topic.newPostingsNum}" />
-				</td>
-				<td>
-					<lams:Date value="${topic.message.lastReplyDate}"/>
-				</td>
-				<c:if test="${not sessionMap.allowNewTopics and sessionMap.minimumReply ne 0}">
-					<td>
-						${topic.numOfPosts} / ${sessionMap.minimumReply}
-					</td>
-				</c:if>
-			</tr>
-		</c:forEach>
-		</tbody>
-	</table>
+		</div>
+
+
 	</div>
-</div>
+	<div class="panel-body">
+		<div class="table-responsive">
+			<table id="topicTable" class="table table-hover table-condensed">
+				<thead>
+					<tr>
+						<th width=""><fmt:message key="lable.topic.title.subject" /></th>
+						<th width="15%"><fmt:message key="lable.topic.title.startedby" /></th>
+						<th width="8%"><fmt:message key="lable.topic.title.replies" /></th>
+						<th width="8%"><fmt:message key="lable.topic.title.repliesnew" /></th>
+						<th width="20%"><fmt:message key="lable.topic.title.update" /></th>
+						<c:if test="${not sessionMap.allowNewTopics and sessionMap.minimumReply ne 0}">
+							<th width="8%">&nbsp;</th>
+						</c:if>
+					</tr>
+				</thead>
+				<tbody>
+					<c:forEach items="${topicList}" var="topic">
+						<tr>
+							<td><c:set var="viewtopic">
+									<html:rewrite
+										page="/learning/viewTopic.do?sessionMapID=${sessionMapID}&topicID=${topic.message.uid}&create=${topic.message.created.time}&hideReflection=${sessionMap.hideReflection}&pageLastId=0&size=${pageSize}" />
+								</c:set> <html:link href="${viewtopic}" styleId="topicTitle">
+									<c:choose>
+										<c:when test="${topic.newPostingsNum > 0}">
+											<b><c:out value="${topic.message.subject}" /></b>
+										</c:when>
+										<c:otherwise>
+											<c:out value="${topic.message.subject}" />
+										</c:otherwise>
+									</c:choose>
+								</html:link> <c:if test="${topic.hasAttachment}">
+									<i class="fa fa-paperclip"></i>
+								</c:if></td>
+							<td><c:set var="author" value="${topic.author}" /> <c:if test="${empty author}">
+									<c:set var="author">
+										<fmt:message key="label.default.user.name" />
+									</c:set>
+								</c:if> <c:out value="${author}" escapeXml="true" /></td>
+
+							<td align="center"><c:out value="${topic.message.replyNumber}" /></td>
+
+							<td align="center"><c:out value="${topic.newPostingsNum}" /></td>
+							<td><time class="timeago"
+									datetime="<fmt:formatDate value='${topic.message.lastReplyDate}' pattern="yyyy-MM-dd'T'HH:mm:ss.S'Z'"/>">
+									<lams:Date value="${topic.message.lastReplyDate}" />
+								</time></td>
+							<c:if test="${not sessionMap.allowNewTopics and sessionMap.minimumReply ne 0}">
+								<td>${topic.numOfPosts}/${sessionMap.minimumReply}</td>
+							</c:if>
+						</tr>
+					</c:forEach>
+				</tbody>
+			</table>
+		</div>
+	</div>
+
+	<script type="text/javascript">
+		jQuery(document).ready(function() {
+			jQuery("time.timeago").timeago();
+		});
+	</script>
\ No newline at end of file
Index: lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp
===================================================================
diff -u -rd5fee901f5527e516add11b0ec872521de171133 -rd3a9876dc1ffb96feebcd861473dd3339e83966e
--- lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp	(.../topicreplyform.jsp)	(revision d5fee901f5527e516add11b0ec872521de171133)
+++ lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp	(.../topicreplyform.jsp)	(revision d3a9876dc1ffb96feebcd861473dd3339e83966e)
@@ -1,20 +1,19 @@
 <%@ include file="/common/taglibs.jsp"%>
 
 <div class="form-group">
-    <label><fmt:message key="message.label.subject" />&nbsp;</label>&nbsp;
-	<html:text size="50" tabindex="1" property="message.subject" maxlength="60"/>&nbsp;
+	<label><fmt:message key="message.label.subject" />&nbsp;</label>&nbsp;
+	<html:text styleClass="form-control" tabindex="1" property="message.subject" maxlength="60" />
+	&nbsp;
 	<html:errors property="message.subject" />
-  </div>
-
- <div class="form-group">
-    <label><fmt:message key="message.label.body" /> *</label><BR/>
+</div>
+<div class="form-group">
+	<label><fmt:message key="message.label.body" /> *</label><BR />
 	<%@include file="bodyarea.jsp"%>
 </div>
-
 <c:if test="${sessionMap.allowUpload}">
 
-	 <div class="form-group">
-    	<label><fmt:message key="message.label.attachment" />&nbsp;</label>
+	<div class="form-group">
+		<label><fmt:message key="message.label.attachment" />&nbsp;</label>
 		<html:file tabindex="3" property="attachmentFile" />
 
 		<div style="font-style: italic; margin-top: 10px">
@@ -27,10 +26,11 @@
 </c:if>
 
 <div class="btn-group-xs voffset5">
-<html:button property="goback" styleId="cancelButton" onclick="javascript:cancelReply();" styleClass="btn btn-default">
-	<fmt:message key="button.cancel" />
-</html:button>
-<html:submit styleClass="btn btn-default" styleId="submitButton">
-	<fmt:message key="button.submit" />
-</html:submit>
+	<html:button property="goback" styleId="cancelButton" onclick="javascript:cancelReply();"
+		styleClass="btn btn-default roffset5">
+		<fmt:message key="button.cancel" />
+	</html:button>
+	<html:submit styleClass="btn btn-default" styleId="submitButton">
+		<fmt:message key="button.submit" />
+	</html:submit>
 </div>
Index: lams_tool_forum/web/jsps/learning/message/topicview.jsp
===================================================================
diff -u -rd5fee901f5527e516add11b0ec872521de171133 -rd3a9876dc1ffb96feebcd861473dd3339e83966e
--- lams_tool_forum/web/jsps/learning/message/topicview.jsp	(.../topicview.jsp)	(revision d5fee901f5527e516add11b0ec872521de171133)
+++ lams_tool_forum/web/jsps/learning/message/topicview.jsp	(.../topicview.jsp)	(revision d3a9876dc1ffb96feebcd861473dd3339e83966e)
@@ -1,13 +1,19 @@
 <%@ page import="org.lamsfoundation.lams.tool.forum.util.ForumConstants"%>
 <%@ include file="/common/taglibs.jsp"%>
 
-<c:set var="maxThreadUid" value="0"/>
-<c:set var="messageTablename" value=""/>
-<c:set var="indent" value="10"/>
+<c:set var="maxThreadUid" value="0" />
+<c:set var="messageTablename" value="" />
+<c:set var="indent" value="10" />
 
-<c:set var="show"><fmt:message key="label.show.replies" /></c:set>
-<c:set var="hide"><fmt:message key="label.hide.replies" /></c:set>
-<c:set var="prompt"><fmt:message key="label.showhide.prompt" /></c:set>
+<c:set var="show">
+	<fmt:message key="label.show.replies" />
+</c:set>
+<c:set var="hide">
+	<fmt:message key="label.hide.replies" />
+</c:set>
+<c:set var="prompt">
+	<fmt:message key="label.showhide.prompt" />
+</c:set>
 <c:set var="tableCommand">expandable:true,initialState:'expanded',
 	expanderTemplate:'<a href=\"#\">&nbsp;&nbsp;&nbsp;&nbsp;${prompt}</a>',
 	stringCollapse:'${hide}',stringExpand:'${show}',
@@ -62,55 +68,51 @@
 <c:forEach var="msgDto" items="${topicThread}">
 	<c:set var="msgLevel" value="${msgDto.level}" />
 	<c:set var="hidden" value="${msgDto.message.hideFlag}" />
-	
+
 	<c:if test='${(msgLevel <= 1)}'>
-		<c:set var="maxThreadUid" value="${msgDto.message.uid}"/>
+		<c:set var="maxThreadUid" value="${msgDto.message.uid}" />
 	</c:if>
 
 	<c:choose>
-	<c:when test='${(msgLevel == 1)}'>
-		<%-- same test & command appears at bottom of script --%>
-		<c:if test='${messageTablename != ""}'>
-			</table>
-			<script> 
+		<c:when test='${(msgLevel == 1)}'>
+			<%-- same test & command appears at bottom of script --%>
+			<c:if test='${messageTablename != ""}'>
+				</table>
+				<script> 
 				$("#${messageTablename}").treetable({${tableCommand}});
-			</script>	
-			</div>
-		</c:if>
-		<c:set var="messageTablename" value="tree${msgDto.message.uid}"/>
-		<div id="thread${msgDto.message.uid}">
-		<table id="${messageTablename}" class="col-xs-12">
-		<tr data-tt-id="${msgDto.message.uid}"><td>	
-	</c:when>
-	<c:otherwise>
-		<tr data-tt-id="${msgDto.message.uid}" data-tt-parent-id="${msgDto.message.parent.uid}"><td>	
-	</c:otherwise>
-	</c:choose>
-	
-	<%@ include file="msgview.jsp"%>
+			</script>
+				
+			</c:if>
+			<c:set var="messageTablename" value="tree${msgDto.message.uid}" />
+			<div id="thread${msgDto.message.uid}">
+				<table id="${messageTablename}" class="col-xs-12">
+					<tr data-tt-id="${msgDto.message.uid}">
+						<td></c:when> <c:otherwise>
+								<tr data-tt-id="${msgDto.message.uid}" data-tt-parent-id="${msgDto.message.parent.uid}">
+									<td>
+							</c:otherwise> </c:choose> <%@ include file="msgview.jsp"%> <c:if test='${(msgLevel == 0)}'>
+								<div id="insertTopLevelRepliesHere"></div>
+							</c:if> <c:if test='${(msgLevel >= 1)}'></td>
+					</tr>
+					</c:if>
 
-	<c:if test='${(msgLevel == 0)}'>
-		<div id="insertTopLevelRepliesHere"></div>
-	</c:if>
-	
-	<c:if test='${(msgLevel >= 1)}'>
-		</td></tr>	
-	</c:if>
+					</c:forEach>
 
-</c:forEach>
-
-	<c:if test='${messageTablename != ""}'>
-		</table>
-		<script>
+					<c:if test='${messageTablename != ""}'>
+				</table>
+				<script>
 			$("#${messageTablename}").treetable({${tableCommand}});
-		</script>	
-		</div>
-	</c:if>
-	
-<c:set var="pageSize" value="<%= ForumConstants.DEFAULT_PAGE_SIZE %>"/>
-<c:if test='${maxThreadUid > 0 && ! noMorePages}'>
-	<div class="text-center">
-	<c:set var="more"><html:rewrite page="/learning/viewTopicNext.do?sessionMapID=${sessionMapID}&topicID=${sessionMap.rootUid}&create=${topic.message.created.time}&hideReflection=${sessionMap.hideReflection}&pageLastId=${maxThreadUid}&size=${pageSize}" /></c:set>
-	<a href="<c:out value="${more}"/>" class="btn btn-xs btn-default"><fmt:message key="label.show.more.messages" /></a>
-	</div>
-</c:if>
+		</script>
+			</div>
+			</c:if>
+
+			<c:set var="pageSize" value="<%=ForumConstants.DEFAULT_PAGE_SIZE%>" />
+			<c:if test='${maxThreadUid > 0 && ! noMorePages}'>
+				<div class="text-center">
+					<c:set var="more">
+						<html:rewrite
+							page="/learning/viewTopicNext.do?sessionMapID=${sessionMapID}&topicID=${sessionMap.rootUid}&create=${topic.message.created.time}&hideReflection=${sessionMap.hideReflection}&pageLastId=${maxThreadUid}&size=${pageSize}" />
+					</c:set>
+					<a href="<c:out value="${more}"/>" class="btn btn-xs btn-default"><fmt:message key="label.show.more.messages" /></a>
+				</div>
+			</c:if>
\ No newline at end of file
Index: lams_tool_forum/web/jsps/learning/viewtopic.jsp
===================================================================
diff -u -r01c1502dbe5770104c4437ea699604ef4df1f8d6 -rd3a9876dc1ffb96feebcd861473dd3339e83966e
--- lams_tool_forum/web/jsps/learning/viewtopic.jsp	(.../viewtopic.jsp)	(revision 01c1502dbe5770104c4437ea699604ef4df1f8d6)
+++ lams_tool_forum/web/jsps/learning/viewtopic.jsp	(.../viewtopic.jsp)	(revision d3a9876dc1ffb96feebcd861473dd3339e83966e)
@@ -12,36 +12,36 @@
 </c:set>
 <c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request" />
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
-<c:set var="pageSize" value="<%= ForumConstants.DEFAULT_PAGE_SIZE %>"/>
+<c:set var="pageSize" value="<%=ForumConstants.DEFAULT_PAGE_SIZE%>" />
 
 <lams:html>
-	<lams:head>
-		<title><fmt:message key="activity.title" /></title>
-		
-		<!-- ********************  CSS ********************** -->
+<lams:head>
+	<title><fmt:message key="activity.title" /></title>
 
-		<lams:css />
-		<link type="text/css" href="${lams}css/jquery.jRating.css" rel="stylesheet"/>
-		<link type="text/css" href="${tool}css/jquery.treetable.css" rel="stylesheet"/>
-		<link type="text/css" href="${tool}css/jquery.treetable.forum.css" rel="stylesheet"/>
-		
-		<!-- ********************  javascript ********************** -->
-		<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
-		<script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>
-		
-		<script type="text/javascript">
+	<!-- ********************  CSS ********************** -->
+
+	<lams:css />
+	<link type="text/css" href="${lams}css/jquery.jRating.css" rel="stylesheet" />
+	<link type="text/css" href="${tool}css/jquery.treetable.css" rel="stylesheet" />
+	<link type="text/css" href="${tool}css/jquery.treetable.forum.css" rel="stylesheet" />
+
+	<!-- ********************  javascript ********************** -->
+	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>
+
+	<script type="text/javascript">
 			var removeItemAttachmentUrl = "<html:rewrite page="/learning/deleteAttachment.do" />";
 			//var for jquery.jRating.js
 			var pathToImageFolder = "${lams}images/css/";
 		</script>
-		<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
-		<script type="text/javascript" src="${lams}includes/javascript/jquery-ui.js"></script>
-		<script type="text/javascript" src="${lams}includes/javascript/jquery.jRating.js"></script>
-		<script type="text/javascript" src="${lams}includes/javascript/jquery.treetable.js"></script>
-		<script type="text/javascript" src="${tool}includes/javascript/jquery.jscroll.js"></script>
-		<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>		
-		<script type="text/javascript" src="${tool}includes/javascript/message.js"></script>
-		<script type="text/javascript">
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery-ui.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.jRating.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.treetable.js"></script>
+	<script type="text/javascript" src="${tool}includes/javascript/jquery.jscroll.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
+	<script type="text/javascript" src="${tool}includes/javascript/message.js"></script>
+	<script type="text/javascript">
 			$(document).ready(function(){
 				setupJRatingSetPath();
 			});
@@ -54,102 +54,99 @@
 				var reqIDVar = new Date();
 				location.href= "<html:rewrite page="/learning/viewTopic.do?sessionMapID=${sessionMapID}&topicID=${sessionMap.rootUid}&hideReflection=${sessionMap.hideReflection}&pageLastId=0&size=${pageSize}&reqUid=" />"+reqIDVar.getTime();;
 			}
-		</script>		
-		
-	</lams:head>
-	<body class="stripes">
-		<lams:Page type="learner" title="${sessionMap.title}">
+		</script>
 
-			<!-- Announcements and advanced settings -->
-			<c:if test="${sessionMap.mode == 'author' || sessionMap.mode == 'learner'}">
-			
-				<c:if test="${not sessionMap.allowNewTopics and ( sessionMap.minimumReply ne 0 or sessionMap.maximumReply ne 0)}">
-					<lams:Alert id="postingLimits" type="info" close="true">
+</lams:head>
+<body class="stripes">
+	<lams:Page type="learner" title="${sessionMap.title}">
+
+		<!-- Announcements and advanced settings -->
+		<c:if test="${sessionMap.mode == 'author' || sessionMap.mode == 'learner'}">
+
+			<c:if test="${not sessionMap.allowNewTopics and ( sessionMap.minimumReply ne 0 or sessionMap.maximumReply ne 0)}">
+				<lams:Alert id="postingLimits" type="info" close="true">
 					<c:if test="${(sessionMap.minimumReply ne 0 and sessionMap.maximumReply ne 0)}">
-							<fmt:message key="label.postingLimits.topic.reminder">
-								<fmt:param value="${sessionMap.minimumReply}" />
-								<fmt:param value="${sessionMap.maximumReply}" />
-								<fmt:param value="${numOfPosts}" />
-								<fmt:param value="${sessionMap.maximumReply - numOfPosts}" />
-							</fmt:message>
+						<fmt:message key="label.postingLimits.topic.reminder">
+							<fmt:param value="${sessionMap.minimumReply}" />
+							<fmt:param value="${sessionMap.maximumReply}" />
+							<fmt:param value="${numOfPosts}" />
+							<fmt:param value="${sessionMap.maximumReply - numOfPosts}" />
+						</fmt:message>
 					</c:if>
 					<c:if test="${(sessionMap.minimumReply ne 0 and sessionMap.maximumReply eq 0)}">
-		                	<fmt:message key="label.postingLimits.topic.reminder.min">
-		                    	<fmt:param value="${sessionMap.minimumReply}" />
-		                    	<fmt:param value="${numOfPosts}" />
-		                    	<fmt:param value="${sessionMap.maximumReply - numOfPosts}" />
-		                    </fmt:message>
-					</c:if>			
-					<c:if test="${(sessionMap.minimumReply eq 0 and sessionMap.maximumReply ne 0)}">
-		                    <fmt:message key="label.postingLimits.topic.reminder.max">
-		                         <fmt:param value="${sessionMap.maximumReply}" />
-		                         <fmt:param value="${numOfPosts}" />
-		                         <fmt:param value="${sessionMap.maximumReply - numOfPosts}" />
-		                     </fmt:message>
+						<fmt:message key="label.postingLimits.topic.reminder.min">
+							<fmt:param value="${sessionMap.minimumReply}" />
+							<fmt:param value="${numOfPosts}" />
+							<fmt:param value="${sessionMap.maximumReply - numOfPosts}" />
+						</fmt:message>
 					</c:if>
-					</lams:Alert>
-				</c:if>
-				
-				<!-- Rating announcements -->
-				<c:if test="${sessionMap.allowRateMessages}">
-					<lams:Alert id="rateMessages" type="info" close="true">
-						<c:choose>
-							<c:when test="${sessionMap.minimumRate ne 0 and sessionMap.maximumRate ne 0}">
-								<fmt:message key="label.rateLimits.forum.reminder">
-									<fmt:param value="${sessionMap.minimumRate}"/>
-									<fmt:param value="${sessionMap.maximumRate}"/>
-								</fmt:message>						
-							</c:when>
-							
-							<c:when test="${sessionMap.minimumRate ne 0 and sessionMap.maximumRate eq 0}">
-								<fmt:message key="label.rateLimits.forum.reminder.min">
-									<fmt:param value="${sessionMap.minimumRate}"/>
-								</fmt:message>					
-							</c:when>
-							
-							<c:when test="${sessionMap.minimumRate eq 0 and sessionMap.maximumRate ne 0}">
-								<fmt:message key="label.rateLimits.forum.reminder.max">
-									<fmt:param value="${sessionMap.maximumRate}"/>
-								</fmt:message>					
-							</c:when>
-						</c:choose>
-						<br>
-						
-						<fmt:message key="label.rateLimits.topic.reminder">
-							<fmt:param value="<span id='numOfRatings'>${sessionMap.numOfRatings}</span>"/>
+					<c:if test="${(sessionMap.minimumReply eq 0 and sessionMap.maximumReply ne 0)}">
+						<fmt:message key="label.postingLimits.topic.reminder.max">
+							<fmt:param value="${sessionMap.maximumReply}" />
+							<fmt:param value="${numOfPosts}" />
+							<fmt:param value="${sessionMap.maximumReply - numOfPosts}" />
 						</fmt:message>
-		
-					</lams:Alert>
-				</c:if>			
-		</c:if>	
+					</c:if>
+				</lams:Alert>
+			</c:if>
+
+			<!-- Rating announcements -->
+			<c:if test="${sessionMap.allowRateMessages}">
+				<lams:Alert id="rateMessages" type="info" close="true">
+					<c:choose>
+						<c:when test="${sessionMap.minimumRate ne 0 and sessionMap.maximumRate ne 0}">
+							<fmt:message key="label.rateLimits.forum.reminder">
+								<fmt:param value="${sessionMap.minimumRate}" />
+								<fmt:param value="${sessionMap.maximumRate}" />
+							</fmt:message>
+						</c:when>
+
+						<c:when test="${sessionMap.minimumRate ne 0 and sessionMap.maximumRate eq 0}">
+							<fmt:message key="label.rateLimits.forum.reminder.min">
+								<fmt:param value="${sessionMap.minimumRate}" />
+							</fmt:message>
+						</c:when>
+
+						<c:when test="${sessionMap.minimumRate eq 0 and sessionMap.maximumRate ne 0}">
+							<fmt:message key="label.rateLimits.forum.reminder.max">
+								<fmt:param value="${sessionMap.maximumRate}" />
+							</fmt:message>
+						</c:when>
+					</c:choose>
+					<br>
+
+					<fmt:message key="label.rateLimits.topic.reminder">
+						<fmt:param value="<span id='numOfRatings'>${sessionMap.numOfRatings}</span>" />
+					</fmt:message>
+
+				</lams:Alert>
+			</c:if>
+		</c:if>
 		<!-- End announcements and advanced settings -->
 
-	<c:set var="buttonPanel">
-		<c:set var="refreshTopicURL"></c:set>
-		<div class="container-fluid">
-		<div class="row no-gutter">
-			<div class="col-xs-6">
-			<a href="javascript:refreshTopic();" class="btn btn-default voffset5  pull-left" role="button"> <fmt:message	key="label.refresh" /> </a>
-			</div>
-			<div class="col-xs-6">
-			<c:set var="backToForum">
-				<html:rewrite
-					page="/learning/viewForum.do?mode=${sessionMap.mode}&sessionMapID=${sessionMapID}&toolSessionID=${sessionMap.toolSessionID}&hideReflection=${sessionMap.hideReflection}" />
-			</c:set>
-			<html:button property="backToForum"
-				onclick="javascript:location.href='${backToForum}';"
-				styleClass="btn btn-primary voffset5 pull-right">
-				<fmt:message key="label.back.to.forum" />
-			</html:button>
-			</div>
-		</div>
-	</div>
-	</c:set>
+		<c:set var="buttonPanel">
+			<c:set var="refreshTopicURL"></c:set>
+				<div class="row no-gutter">
+					<div class="col-xs-12">
+						<a href="javascript:refreshTopic();" class="btn btn-sm btn-default voffset5  pull-left" role="button"> <fmt:message
+								key="label.refresh" />
+						</a>
+						<c:set var="backToForum">
+							<html:rewrite
+								page="/learning/viewForum.do?mode=${sessionMap.mode}&sessionMapID=${sessionMapID}&toolSessionID=${sessionMap.toolSessionID}&hideReflection=${sessionMap.hideReflection}" />
+						</c:set>
+						<html:button property="backToForum" onclick="javascript:location.href='${backToForum}';"
+							styleClass="btn btn-sm btn-primary voffset5 pull-right">
+							<fmt:message key="label.back.to.forum" />
+						</html:button>
+					</div>
+				</div>
+		</c:set>
 		
 		${buttonPanel}
 
-		<div class="scroll" >
-		<%@ include file="message/topicview.jsp"%>
+		<div class="scroll">
+			<%@ include file="message/topicview.jsp"%>
 		</div>
 		<script>
 			<c:set var="loading_animation">${lams}images/ajax-loader.gif</c:set>
@@ -161,5 +158,5 @@
 
 	</lams:Page>
 
-	</body>
+</body>
 </lams:html>