Index: lams_tool_forum/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -rfea59b0b24b8ec1e34f7dedc6d279be3aac4fff6 -rd5fee901f5527e516add11b0ec872521de171133
--- lams_tool_forum/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision fea59b0b24b8ec1e34f7dedc6d279be3aac4fff6)
+++ lams_tool_forum/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision d5fee901f5527e516add11b0ec872521de171133)
@@ -245,6 +245,7 @@
 message.complete.or.cancel.reply  =Please complete or cancel the current reply before starting a new reply.
 message.complete.or.cancel.edit  =Please complete or cancel the current edit before starting a new edit.
 error.cannot.redisplay.please.refresh  =Your changes have been saved but cannot be redisplayed. Please select refresh to reload the forum messages.
+label.topics  =Topics
 
 
 #======= End labels: Exported 239 labels for en AU =====
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java
===================================================================
diff -u -rbec5d3437f63b02dcce242c16cddfe49b88daa8d -rd5fee901f5527e516add11b0ec872521de171133
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java	(.../ForumConstants.java)	(revision bec5d3437f63b02dcce242c16cddfe49b88daa8d)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java	(.../ForumConstants.java)	(revision d5fee901f5527e516add11b0ec872521de171133)
@@ -207,7 +207,7 @@
     // for paging long topics & inlining reply
     public static final String PAGE_LAST_ID = "pageLastId";
     public static final String PAGE_SIZE = "size";
-    public static final int DEFAULT_PAGE_SIZE = 2;
+    public static final int DEFAULT_PAGE_SIZE = 50;
     public static final String ATTR_MESS_ID = "messageUid";
     public static final String ATTR_THREAD_ID = "threadUid";
     public static final String ATTR_NO_MORE_PAGES = "noMorePages";
Index: lams_tool_forum/web/WEB-INF/tags/Alert.tag
===================================================================
diff -u
--- lams_tool_forum/web/WEB-INF/tags/Alert.tag	(revision 0)
+++ lams_tool_forum/web/WEB-INF/tags/Alert.tag	(revision d5fee901f5527e516add11b0ec872521de171133)
@@ -0,0 +1,46 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+
+<%@ attribute name="close" required="false" rtexprvalue="true"%>
+<%@ attribute name="id" required="false" rtexprvalue="true"%>
+<%@ attribute name="type" required="false" rtexprvalue="true"%>
+
+<c:set var="idName" value="alert-${type}" />
+<c:if test="${not empty id}">
+	<c:set var="idName" value="${id}" />
+</c:if>
+
+<c:set var="alertType" value="info" />
+<c:set var="iconType" value="info-circle" />
+<c:choose>
+	<c:when test="${type == 'danger'}">
+		<c:set var="alertType" value="danger" />
+		<c:set var="iconType" value="times-circle" />
+	</c:when>
+	<c:when test="${type == 'success'}">
+		<c:set var="alertType" value="success" />
+		<c:set var="iconType" value="check-circle" />
+	</c:when>
+	<c:when test="${type == 'warning'}">
+		<c:set var="alertType" value="warning" />
+		<c:set var="iconType" value="exclamation-circle" />
+	</c:when>
+</c:choose>
+
+<div class="row no-gutter">
+	<div class="col-xs-12 col-sm-offset-2 col-sm-8">
+		<div id="${idName}" class="alert alert-${alertType}" style="margin-bottom: 10px; padding: 8px">
+			<div class="media">
+				<div class="media-left">
+					<i class="fa fa-lg fa-${iconType} text-muted"></i>
+				</div>
+				<div class="media-body">
+					<c:if test="${close}">
+							<a href="#" class="close pull-right" data-dismiss="alert" aria-label="close">&times;</a>
+					</c:if>
+					<jsp:doBody />
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
Index: lams_tool_forum/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -rfef442a88ab05c91db8a551081c4abc060d4da5e -rd5fee901f5527e516add11b0ec872521de171133
--- lams_tool_forum/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision fef442a88ab05c91db8a551081c4abc060d4da5e)
+++ lams_tool_forum/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision d5fee901f5527e516add11b0ec872521de171133)
@@ -1,6 +1,6 @@
 
 <%
-	 /****************************************************************
+	/****************************************************************
 	 * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
 	 * =============================================================
 	 * License Information: http://lamsfoundation.org/licensing/lams/2.0/
@@ -49,10 +49,18 @@
 	<c:set var="buttonTryAgainKey" value="button.try.again" />
 </c:if>
 
-<p>
-	<fmt:message key="${defineLaterMessageKey}" />
-</p>
-<div align="right" class="space-bottom-top">
-	<a href="javascript:location.reload(true);" class="button"><fmt:message
-			key="${buttonTryAgainKey}" /> </a>
+<div class="row no-gutter">
+	<div
+		class="col-xs-12 col-sm-offset-1 col-sm-10 col-lg-offset-2 col-lg-8">
+		<div class="alert alert-info">
+			<fmt:message key="${defineLaterMessageKey}" />
+		</div>
+	</div>
 </div>
+<div class="row no-gutter">
+	<div class="col-xs-12">
+		<a href="javascript:location.reload(true);"
+			class="btn btn-primary pull-right voffset5"><fmt:message
+				key="${buttonTryAgainKey}" /></a>
+	</div>
+</div>
\ No newline at end of file
Index: lams_tool_forum/web/WEB-INF/tags/Page.tag
===================================================================
diff -u
--- lams_tool_forum/web/WEB-INF/tags/Page.tag	(revision 0)
+++ lams_tool_forum/web/WEB-INF/tags/Page.tag	(revision d5fee901f5527e516add11b0ec872521de171133)
@@ -0,0 +1,36 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+
+<%@ attribute name="type" required="true" rtexprvalue="true"%>
+<%@ attribute name="style" required="false" rtexprvalue="true"%>
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
+<%@ attribute name="headingContent" required="false" rtexprvalue="true"%>
+
+
+
+<div class="row no-gutter">
+	<div class="col-xs-12">
+		<div class="container" id="content">
+			<div class="panel panel-default panel-${type}-page">
+				<div class="panel-heading">
+					<c:if test="${not empty title}">
+						<div class="panel-title panel-${type}-title">
+							<c:out value="${title}" escapeXml="true" />
+							<c:if test="${not empty titleHelpURL}">
+								<a style="float: right" href="${titleHelpURL}" target="_new"><span class="help" style="margin: 0px"></span></a>
+							</c:if>
+						</div>
+					</c:if>
+					<c:if test="${not empty headingContent}">
+						<c:out value="${headingContent}" escapeXml="true" />
+					</c:if>
+				</div>
+				<div class="panel-body panel-${type}-body">
+					<jsp:doBody />
+				</div>
+			</div>
+		</div>
+		<! -- End content container -->
+	</div>
+</div>
Index: lams_tool_forum/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r5e63656a12c02f7476564e278b43ff4ce86ac930 -rd5fee901f5527e516add11b0ec872521de171133
--- lams_tool_forum/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 5e63656a12c02f7476564e278b43ff4ce86ac930)
+++ lams_tool_forum/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision d5fee901f5527e516add11b0ec872521de171133)
@@ -432,12 +432,12 @@
 		<path>/WEB-INF/tags/DefineLater.tag</path>
    	</tag-file>  
    	<tag-file>
-	    <name>ImgButtonWrapper</name>
-		<path>/WEB-INF/tags/ImgButtonWrapper.tag</path>
-   	</tag-file>
+	    <name>Alert</name>
+		<path>/WEB-INF/tags/Alert.tag</path>
+   	</tag-file>  
    	<tag-file>
-	    <name>TextSearch</name>
-		<path>/WEB-INF/tags/TextSearch.tag</path>
+	    <name>Page</name>
+		<path>/WEB-INF/tags/Page.tag</path>
    	</tag-file>  
    	<tag>
     <name>textarea</name>
Index: lams_tool_forum/web/WEB-INF/urlrewrite.xml
===================================================================
diff -u -r2ff38cdf504d51a2590b113023d885069d32645e -rd5fee901f5527e516add11b0ec872521de171133
--- lams_tool_forum/web/WEB-INF/urlrewrite.xml	(.../urlrewrite.xml)	(revision 2ff38cdf504d51a2590b113023d885069d32645e)
+++ lams_tool_forum/web/WEB-INF/urlrewrite.xml	(.../urlrewrite.xml)	(revision d5fee901f5527e516add11b0ec872521de171133)
@@ -9,38 +9,6 @@
 
 -->
 <urlrewrite>
-
-     <rule>
-        <note>
-            The rule means that requests to tool's learning jsp will be redirected to /learning/mobile/ folder
-            containing mobile version of jsps.
-            Regexes are taken  from http://detectmobilebrowser.com/download/jsp. and we might need to update it somewhere in the future.
-        </note>
-        <condition name="user-agent" next="or">.*(android|avantgo|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|ipad|iris|kindle|lge |maemo|midp|mmp|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\\/|plucker|pocket|psp|symbian|treo|up\\.(browser|link)|vodafone|wap|windows (ce|phone)|xda|xiino).*?i</condition>
-    	<condition name="user-agent">^(1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\\-(n|u)|c55\\/|capi|ccwa|cdm\\-|cell|chtm|cldc|cmd\\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\\-s|devi|dica|dmob|do(c|p)o|ds(12|\\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\\-|_)|g1 u|g560|gene|gf\\-5|g\\-mo|go(\\.w|od)|gr(ad|un)|haie|hcit|hd\\-(m|p|t)|hei\\-|hi(pt|ta)|hp( i|ip)|hs\\-c|ht(c(\\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\\-(20|go|ma)|i230|iac( |\\-|\\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\\/)|klon|kpt |kwc\\-|kyo(c|k)|le(no|xi)|lg( g|\\/(k|l|u)|50|54|e\\-|e\\/|\\-[a-w])|libw|lynx|m1\\-w|m3ga|m50\\/|ma(te|ui|xo)|mc(01|21|ca)|m\\-cr|me(di|rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\\-2|po(ck|rt|se)|prox|psio|pt\\-g|qa\\-a|qc(07|12|21|32|60|\\-[2-7]|i\\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\\-|oo|p\\-)|sdk\\/|se(c(\\-|0|1)|47|mc|nd|ri)|sgh\\-|shar|sie(\\-|m)|sk\\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\\-|v\\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\\-|tdg\\-|tel(i|m)|tim\\-|t\\-mo|to(pl|sh)|ts(70|m\\-|m3|m5)|tx\\-9|up(\\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|xda(\\-|2|g)|yas\\-|your|zeto|zte\\-).*?i</condition>
-        <from>^/includes/learnerLayout.jsp$</from>
-        <to>/includes/mobileLearnerLayout.jsp</to>
-    </rule>
-
-     <rule>
-        <note>
-            Handles the exceptional case of /jsps/learning/viewtopic.jsp which doens't use tiles.
-        </note>
-        <condition name="user-agent" next="or">.*(android|avantgo|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|ipad|iris|kindle|lge |maemo|midp|mmp|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\\/|plucker|pocket|psp|symbian|treo|up\\.(browser|link)|vodafone|wap|windows (ce|phone)|xda|xiino).*?i</condition>
-    	<condition name="user-agent">^(1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\\-(n|u)|c55\\/|capi|ccwa|cdm\\-|cell|chtm|cldc|cmd\\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\\-s|devi|dica|dmob|do(c|p)o|ds(12|\\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\\-|_)|g1 u|g560|gene|gf\\-5|g\\-mo|go(\\.w|od)|gr(ad|un)|haie|hcit|hd\\-(m|p|t)|hei\\-|hi(pt|ta)|hp( i|ip)|hs\\-c|ht(c(\\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\\-(20|go|ma)|i230|iac( |\\-|\\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\\/)|klon|kpt |kwc\\-|kyo(c|k)|le(no|xi)|lg( g|\\/(k|l|u)|50|54|e\\-|e\\/|\\-[a-w])|libw|lynx|m1\\-w|m3ga|m50\\/|ma(te|ui|xo)|mc(01|21|ca)|m\\-cr|me(di|rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\\-2|po(ck|rt|se)|prox|psio|pt\\-g|qa\\-a|qc(07|12|21|32|60|\\-[2-7]|i\\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\\-|oo|p\\-)|sdk\\/|se(c(\\-|0|1)|47|mc|nd|ri)|sgh\\-|shar|sie(\\-|m)|sk\\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\\-|v\\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\\-|tdg\\-|tel(i|m)|tim\\-|t\\-mo|to(pl|sh)|ts(70|m\\-|m3|m5)|tx\\-9|up(\\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|xda(\\-|2|g)|yas\\-|your|zeto|zte\\-).*?i</condition>
-        <from>^/jsps/learning/viewtopic.jsp$</from>
-        <to>/jsps/learning/mobile/viewtopic.jsp</to>
-    </rule>
-
-     <rule>
-        <note>
-            Handles the exceptional case of /jsps/learning/message/topicviewwrapper.jsp which doesn't use tiles.
-        </note>
-        <condition name="user-agent" next="or">.*(android|avantgo|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|ipad|iris|kindle|lge |maemo|midp|mmp|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\\/|plucker|pocket|psp|symbian|treo|up\\.(browser|link)|vodafone|wap|windows (ce|phone)|xda|xiino).*?i</condition>
-    	<condition name="user-agent">^(1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\\-(n|u)|c55\\/|capi|ccwa|cdm\\-|cell|chtm|cldc|cmd\\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\\-s|devi|dica|dmob|do(c|p)o|ds(12|\\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\\-|_)|g1 u|g560|gene|gf\\-5|g\\-mo|go(\\.w|od)|gr(ad|un)|haie|hcit|hd\\-(m|p|t)|hei\\-|hi(pt|ta)|hp( i|ip)|hs\\-c|ht(c(\\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\\-(20|go|ma)|i230|iac( |\\-|\\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\\/)|klon|kpt |kwc\\-|kyo(c|k)|le(no|xi)|lg( g|\\/(k|l|u)|50|54|e\\-|e\\/|\\-[a-w])|libw|lynx|m1\\-w|m3ga|m50\\/|ma(te|ui|xo)|mc(01|21|ca)|m\\-cr|me(di|rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\\-2|po(ck|rt|se)|prox|psio|pt\\-g|qa\\-a|qc(07|12|21|32|60|\\-[2-7]|i\\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\\-|oo|p\\-)|sdk\\/|se(c(\\-|0|1)|47|mc|nd|ri)|sgh\\-|shar|sie(\\-|m)|sk\\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\\-|v\\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\\-|tdg\\-|tel(i|m)|tim\\-|t\\-mo|to(pl|sh)|ts(70|m\\-|m3|m5)|tx\\-9|up(\\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|xda(\\-|2|g)|yas\\-|your|zeto|zte\\-).*?i</condition>
-        <from>^/jsps/learning/message/topicviewwrapper.jsp$</from>
-        <to>/jsps/learning/mobile/message/topicviewwrapper.jsp</to>
-    </rule>
-
+<!--  Removed the rewrites so we can test the new layout. JSP files themselves still be to removed. -->
 </urlrewrite>
 
Index: lams_tool_forum/web/common/messages.jsp
===================================================================
diff -u -r2700025047410d38f40b3bd7c56966a9fc08bb29 -rd5fee901f5527e516add11b0ec872521de171133
--- lams_tool_forum/web/common/messages.jsp	(.../messages.jsp)	(revision 2700025047410d38f40b3bd7c56966a9fc08bb29)
+++ lams_tool_forum/web/common/messages.jsp	(.../messages.jsp)	(revision d5fee901f5527e516add11b0ec872521de171133)
@@ -1,8 +1,8 @@
 <%-- Error Messages --%>
 <logic:messagesPresent>
-	<p class="warning">
+		<lams:Alert id="errorMessages" type="danger" close="false">
         <html:messages id="error">
-            <c:out value="${error}" escapeXml="false"/><br/>
+            <c:out value="${error}" escapeXml="false"/>
         </html:messages>
-	</p>
-</logic:messagesPresent>
\ No newline at end of file
+    </lams:Alert>
+</logic:messagesPresent>
Index: lams_tool_forum/web/includes/learnerLayout.jsp
===================================================================
diff -u -r5e63656a12c02f7476564e278b43ff4ce86ac930 -rd5fee901f5527e516add11b0ec872521de171133
--- lams_tool_forum/web/includes/learnerLayout.jsp	(.../learnerLayout.jsp)	(revision 5e63656a12c02f7476564e278b43ff4ce86ac930)
+++ lams_tool_forum/web/includes/learnerLayout.jsp	(.../learnerLayout.jsp)	(revision d5fee901f5527e516add11b0ec872521de171133)
@@ -23,7 +23,12 @@
 		<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" 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">
 			var removeItemAttachmentUrl = "<html:rewrite page="/learning/deleteAttachment.do" />";
 			var warning = '<fmt:message key="warn.minimum.number.characters" />';
Index: lams_tool_forum/web/jsps/learning/create.jsp
===================================================================
diff -u -rac12c171d18673d283c3304f1333ebb00e3819d0 -rd5fee901f5527e516add11b0ec872521de171133
--- lams_tool_forum/web/jsps/learning/create.jsp	(.../create.jsp)	(revision ac12c171d18673d283c3304f1333ebb00e3819d0)
+++ lams_tool_forum/web/jsps/learning/create.jsp	(.../create.jsp)	(revision d5fee901f5527e516add11b0ec872521de171133)
@@ -7,20 +7,20 @@
 	<c:set var="sessionMapID" value="${formBean.sessionMapID}" />
 	<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 
-	<div id="content">
+	<lams:Page type="learner" title="${sessionMap.title}">
 
-		<h1>
-			<c:out value="${sessionMap.title}" escapeXml="true"/>
-		</h1>
+		<div class="container-fluid">
+		<div class="panel panel-default">
+			<div class="panel-heading panel-title">
+				<fmt:message key="title.message.edit" />
+			</div>
+			<div class="panel-body">
+				<html:errors property="error" />
+ 				<%@ include file="/jsps/learning/message/topicform.jsp"%>
+			</div>
+		</div>
+		</div>		
+	</lams:Page>
 
-		<h2>
-			<fmt:message key="title.message.edit" />
-		</h2>
-
-		<html:errors property="error" />
-		<%@ include file="/jsps/learning/message/topicform.jsp"%>
-
-	</div>
-
 </html:form>
 
Index: lams_tool_forum/web/jsps/learning/definelater.jsp
===================================================================
diff -u -rdb44c0602e8fa1b68b2ebce18a58a3d8215cc61b -rd5fee901f5527e516add11b0ec872521de171133
--- lams_tool_forum/web/jsps/learning/definelater.jsp	(.../definelater.jsp)	(revision db44c0602e8fa1b68b2ebce18a58a3d8215cc61b)
+++ lams_tool_forum/web/jsps/learning/definelater.jsp	(.../definelater.jsp)	(revision d5fee901f5527e516add11b0ec872521de171133)
@@ -1,13 +1,11 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<div id="content">
-	<h1>
-		<fmt:message key="activity.title" />
-	</h1>
+<c:set var="title"><fmt:message key="activity.title" /></c:set>
+
+<lams:Page type="learner" title="${title}">
 	<lams:DefineLater />
-</div>
+</lams:Page>
 
 
 
 
-
Index: lams_tool_forum/web/jsps/learning/edit.jsp
===================================================================
diff -u -rb732d53d7176e05258acb291c209dfeb1e6e6704 -rd5fee901f5527e516add11b0ec872521de171133
--- lams_tool_forum/web/jsps/learning/edit.jsp	(.../edit.jsp)	(revision b732d53d7176e05258acb291c209dfeb1e6e6704)
+++ lams_tool_forum/web/jsps/learning/edit.jsp	(.../edit.jsp)	(revision d5fee901f5527e516add11b0ec872521de171133)
@@ -1,8 +1,5 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/jquery.js"></script>
-<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/jquery.jRating.js"></script>
-<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/jquery-ui.js"></script>
 <script type="text/javascript" src="<lams:WebAppURL />includes/javascript/message.js"></script>
 
 <script type="text/javascript">
@@ -15,8 +12,6 @@
     	e.stopPropagation();
 	});
 	
-	// The treetable code uses the clicks to expand and collapse the replies but then 
-	// the buttons will not work. So stop the event propogating up the event chain. 
 	$('#editForm').submit(function() { // catch the form's submit event
 
 		if ( validateForm() ) {
@@ -38,7 +33,7 @@
         			var messageUid = response.messageUid;
 					if ( messageUid ) {
 	        			var rootUid = response.rootUid;
-	        			var messDiv = document.getElementById('msg'+messageUid);
+	        			var messDiv = document.getElementById('outermsg'+messageUid);
 	        			if ( ! messDiv) {
 	        				alert('<fmt:message key="error.cannot.redisplay.please.refresh"/>');
         				} else {
@@ -47,7 +42,7 @@
 							$('#edit').remove();
 	        				var loadString = '<html:rewrite page="/learning/viewMessage.do?topicID="/>' + rootUid + "&sessionMapID=" + response.sessionMapID + "&messageUid="+messageUid;
 							$(messDiv).load(loadString, function() {
-								$('#msg'+messageUid).focus();
+								$('#pb-msg'+messageUid).focus();
 								setupJRating("<c:url value='/learning/rateMessage.do'/>?toolSessionID=${sessionMap.toolSessionID}&sessionMapID=${sessionMapID}");
 								highlightMessage();
 							});
@@ -77,21 +72,17 @@
 	<c:set var="sessionMapID" value="${formBean.sessionMapID}"/>
 	<c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
 
-	<div id="content">
-
-		<h1>
-			<c:out value="${sessionMap.title}" escapeXml="true" />
-		</h1>
-
-		<h2>
+	<div class="container-fluid">
+	<div class="panel panel-default">
+		<div class="panel-heading panel-title">
 			<fmt:message key="title.message.edit" />
-		</h2>
-
-		<html:errors property="error" />
-
-		<%@ include file="/jsps/learning/message/topiceditform.jsp"%>
-
+		</div>
+		<div class="panel-body">
+			<html:errors property="error" />
+			<%@ include file="/jsps/learning/message/topiceditform.jsp"%>
+		</div>
 	</div>
+	</div>
 
 </html:form>
 
Index: lams_tool_forum/web/jsps/learning/message/bodyarea.jsp
===================================================================
diff -u -rac12c171d18673d283c3304f1333ebb00e3819d0 -rd5fee901f5527e516add11b0ec872521de171133
--- lams_tool_forum/web/jsps/learning/message/bodyarea.jsp	(.../bodyarea.jsp)	(revision ac12c171d18673d283c3304f1333ebb00e3819d0)
+++ lams_tool_forum/web/jsps/learning/message/bodyarea.jsp	(.../bodyarea.jsp)	(revision d5fee901f5527e516add11b0ec872521de171133)
@@ -1,32 +1,29 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<div>
-	
 	<%-- for validateForm() method --%>
 	<input type="hidden" name="minCharactersEnabled" id="min-characters-enabled" value="${sessionMap.minCharacters > 0}"/>
-	
+
 	<c:if test="${sessionMap.minCharacters > 0}">
-		<div class="info">
+		<lams:Alert id="minCharacters" type="info" close="true">
 			<fmt:message key="info.minimum.number.characters" >
 				<fmt:param>${sessionMap.minCharacters}</fmt:param>
 			</fmt:message>
-		</div>
+		</lams:Alert>
 	</c:if>
 
 	<c:choose>
 		<c:when test="${sessionMap.allowRichEditor}">
-			<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
 			<lams:CKEditor id="message.body" value="${formBean.message.body}" 
 					contentFolderID="${sessionMap.learnerContentFolder}" toolbarSet="DefaultLearner">
 			</lams:CKEditor>
 		</c:when>
 		
 		<c:otherwise>
-			<%-- Does not user general tag becuase this field need keep compatible with CKEditor's content --%>
-			<lams:STRUTS-textarea rows="10" cols="60" tabindex="2" property="message.body"/>
+			<%-- 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"/> 
 		</c:otherwise>
 	</c:choose>
-	<BR>
+	<BR/>
 		
 	<%-- If limitChars == 0, then we don't want to limit the characters at all. --%>
 	<c:if test="${sessionMap.maxCharacters > 0}">
@@ -150,8 +147,6 @@
 		});
 		</script>			
 	</c:if>
-		
-	<BR>
+
 	<html:errors property="message.body" />
 
-<div>
Fisheye: Tag d5fee901f5527e516add11b0ec872521de171133 refers to a dead (removed) revision in file `lams_tool_forum/web/jsps/learning/message/msgattachment.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_forum/web/jsps/learning/message/msgview.jsp
===================================================================
diff -u -rb732d53d7176e05258acb291c209dfeb1e6e6704 -rd5fee901f5527e516add11b0ec872521de171133
--- lams_tool_forum/web/jsps/learning/message/msgview.jsp	(.../msgview.jsp)	(revision b732d53d7176e05258acb291c209dfeb1e6e6704)
+++ lams_tool_forum/web/jsps/learning/message/msgview.jsp	(.../msgview.jsp)	(revision d5fee901f5527e516add11b0ec872521de171133)
@@ -6,15 +6,6 @@
 	<c:set var="hidden" value="${msgDto.message.hideFlag}" />
 	
 	<c:choose>
-	<c:when test='${(msgDto.level <= 1)}'>
-		<c:set var="indentSize" value="0" />
-	</c:when>
-	<c:otherwise>
-		<c:set var="indentSize" value="${(msgDto.level-1)*indent}" />
-	</c:otherwise>
-	</c:choose>
-
-	<c:choose>
 	<c:when test='${msgDto.message.uid == messageUid}'>
 		<c:set var="highlightClass">highlight</c:set>
 	</c:when>
@@ -23,166 +14,146 @@
 	</c:otherwise> 
 	</c:choose>
 	
-	<div id="msg${msgDto.message.uid}" class="${highlightClass}" style="margin-left:<c:out value="${indentSize}"/>px;">
-		<table id="table${msgDto.message.uid}" cellspacing="0" class="forum ${highlightClass}" >
-			<tr>
-				<th id="subject">
-					<c:choose>
-						<c:when test='${(sessionMap.mode == "teacher") || (not hidden)}'>
-							<c:out value="${msgDto.message.subject}" />
-						</c:when>
-						<c:otherwise>
-							<fmt:message key="topic.message.subject.hidden" />
-						</c:otherwise>
-					</c:choose>
-				</th>
-			</tr>
-			<tr>
-				<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}" />
-						<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>
-				</td>
-			</tr>
-			<tr>
-				<td>
-					<span id="msgBody">
-					<c:if
-						test='${(not hidden) || (hidden && sessionMap.mode == "teacher")}'>
-						<c:out value="${msgDto.message.body}" escapeXml="false" />
-					</c:if>
-					<c:if test='${hidden}'>
-						<i><fmt:message key="topic.message.body.hidden" /> </i>
-					</c:if>
-					</span>
-				</td>
-			</tr>
+	<%--  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}">
+	</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}">
+	</c:otherwise>
+	</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>						
+				-
+				<span id="date"><lams:Date value="${msgDto.message.updated}" /></span>
+			</c:if>
+			</span>
+			<c:choose>
+			<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:choose>
+		</h4>
+		</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}'>
+				&nbsp;<em><fmt:message key="topic.message.body.hidden" /> </em>
+			</c:if>
+			</span>
+
 			<c:if test="${not empty msgDto.message.attachments}">
-				<tr>
-					<td>
-						<div id="attachments">
-						<img src="<html:rewrite page="/images/paperclip.gif"/>" class="space-left float-left">
-						<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" />
-								</c:set>
-								<a href="<c:out value='${downloadURL}' escapeXml='false'/>">
-									<c:out value="${file.fileName}" /> </a>
-							</c:forEach>
-						</c:if>
-						<c:if test='${hidden}'>
-							<fmt:message key="topic.message.attachment.hidden" />
-						</c:if>
-						</div>
-					</td>
-				</tr>
+			<div id="attachments${msgDto.message.uid}" class="attachments">
+				<i class="fa fa-paperclip"></i>
+				<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" />
+						</c:set>
+						<a href="<c:out value='${downloadURL}' escapeXml='false'/>"><c:out value="${file.fileName}" /> </a>
+					</c:forEach>
+				</c:if>
+				<c:if test='${hidden}'>
+					&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)}">
-				<tr>
-					<td>
-						<span class="field-name"><fmt:message
-								key="lable.topic.title.mark" />
-						</span>
-						<BR>
-						<fmt:formatNumber value="${msgDto.mark}"  maxFractionDigits="2"/>
-					</td>
-				</tr>
-				<tr>
-					<td>
-						<span class="field-name"><fmt:message
-								key="lable.topic.title.comment" />
-						</span>
-						<BR>
-						<c:choose>
-							<c:when test="${empty msgDto.comment}">
-								<fmt:message key="message.not.avaliable" />
-							</c:when>
-							<c:otherwise>
-								<c:out value="${msgDto.comment}" escapeXml="false" />
-							</c:otherwise>
-						</c:choose>
-					</td>
-				</tr>
+			
+			<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" />
+					</c:when>
+					<c:otherwise>
+						<c:out value="${msgDto.comment}" escapeXml="false" />
+					</c:otherwise>
+				</c:choose>
+				</div>
 			</c:if>
-			<tr>
-				<td>
-					<div class="right-buttons">
-						<!--  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}" />
-							</c:set>
-							<html:link href="${updateMark}" styleClass="button">
-								<fmt:message key="lable.topic.title.mark" />
-							</html:link>
+
+			<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}" />
+				</c:set>
+				<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="button">
-										<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="button">
-										<fmt:message key="label.hide" />
-									</html:link>
-								</c:otherwise>
-							</c:choose>
-						</c:if>
+				<!--  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:choose>
+				&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: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="button"><fmt:message key="label.edit" /></a>
-							</c:if>
-					
-							<!--  Reply Button -->
-							<c:if
-								test="${(not sessionMap.finishedLock) && (not noMorePosts)}">
-								<c:set var="replytopic">
-									<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="button replybutton"><fmt:message key="label.reply" /></a>
-							</c:if>
-						</c:if>
-					</div>
-				</td>
-			</tr>
-		</table>
+			<!--  Reply Button -->
+			<c:if test="${(not sessionMap.finishedLock) && (not noMorePosts)}">
+				<c:set var="replytopic">
+					<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>
+				&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: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>
+				</c:if>
+			</c:if>			
+			
 	</div>
+	</div>
+	</div>
+	</div>
+	</div>
 
Index: lams_tool_forum/web/jsps/learning/message/msgviewwrapper.jsp
===================================================================
diff -u -r2ef18e4c87e2e7929950dbeb990c6715ef16c0c2 -rd5fee901f5527e516add11b0ec872521de171133
--- lams_tool_forum/web/jsps/learning/message/msgviewwrapper.jsp	(.../msgviewwrapper.jsp)	(revision 2ef18e4c87e2e7929950dbeb990c6715ef16c0c2)
+++ lams_tool_forum/web/jsps/learning/message/msgviewwrapper.jsp	(.../msgviewwrapper.jsp)	(revision d5fee901f5527e516add11b0ec872521de171133)
@@ -6,17 +6,17 @@
 
 <script type="text/javascript">
 
-	// The treetable code uses the clicks to expand and collapse the replies but then 
-	// the buttons will not work. So stop the event propogating up the event chain. 
-	$(".button").click(function (e) {
-		e.stopPropagation();
-	});
-	$(".rating-stars-div").click(function (e) {
-		e.stopPropagation();
-	});
-	$("#attachments").click(function (e) {
-    	e.stopPropagation();
-	});
+// The treetable code uses the clicks to expand and collapse the replies but then 
+// the buttons will not work. So stop the event propogating up the event chain. 
+$(".button").click(function (e) {
+	e.stopPropagation();
+});
+$(".msg-footer").click(function (e) {
+	e.stopPropagation();
+});
+$(".attachments").click(function (e) {
+	e.stopPropagation();
+});
 
 
 </script>
Index: lams_tool_forum/web/jsps/learning/message/topiceditform.jsp
===================================================================
diff -u -r2ff38cdf504d51a2590b113023d885069d32645e -rd5fee901f5527e516add11b0ec872521de171133
--- lams_tool_forum/web/jsps/learning/message/topiceditform.jsp	(.../topiceditform.jsp)	(revision 2ff38cdf504d51a2590b113023d885069d32645e)
+++ lams_tool_forum/web/jsps/learning/message/topiceditform.jsp	(.../topiceditform.jsp)	(revision d5fee901f5527e516add11b0ec872521de171133)
@@ -1,40 +1,49 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<div class="field-name title-space-top">
-	<fmt:message key="message.label.subject" />
+<div class="form-group">
+    <label><fmt:message key="message.label.subject" />&nbsp;</label>
+	<html:text size="50" tabindex="1" property="message.subject" maxlength="60"/> &nbsp;
+	<html:errors property="message.subject" />
 </div>
 
-<html:text size="50" tabindex="1" property="message.subject" maxlength="60" />
-<html:errors property="message.subject" />
-
-<div class="field-name title-space-top">
-	<fmt:message key="message.label.body" />
-	*
+<div class="form-group">
+    <label><fmt:message key="message.label.body" />  *</label><BR/>
+	<%@include file="bodyarea.jsp"%>
 </div>
 
-<%@include file="bodyarea.jsp"%>
-
 <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>
-
+	 <div class="form-group">
+    	<label><fmt:message key="message.label.attachment" />&nbsp;</label><img src="${ctxPath}/images/indicator.gif" style="display:none" id="itemAttachmentArea_Busy" />
+		<div id="itemAttachmentArea">
+			<c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request"/>
+			<input type="hidden" name="hasAttachment" value="${topic.hasAttachment}"/>
+			<c:if test="${topic.hasAttachment}">
+					<c:forEach var="file" items="${topic.message.attachments}">
+					    <a id="removeAttachmentButton" href="#" onclick="removeAtt('${sessionMapID}')" class="btn btn-default btn-xs"><i class="fa fa-trash-o"></i></a>
+						<fmt:message key="message.label.attachment"/>: 
+						<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>
+				  		<BR/>
+			  		</c:forEach>
+				</ul>
+			</c:if>
+			
+			<c:if test="${not topic.hasAttachment && allowUpload}">
+				<input type="file" name="attachmentFile" size="55"  /> 
+			</c:if>
+		</div>
+	</div>		
 </c:if>
 
-<div class="space-bottom-top">
-	<div class="right-buttons">
-		<html:button property="goback" styleId="cancelButton" onclick="javascript:cancelEdit();"	styleClass="button">
-			<fmt:message key="button.cancel" />
-		</html:button>
-		<html:submit styleClass="button" styleId="submitButton">
-			<fmt:message key="button.submit" />
-		</html:submit>
-	</div>
+<div class="btn-group-xs voffset5">
+<html:button property="goback" styleId="cancelButton" onclick="javascript:cancelEdit();" 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>
 </div>
Index: lams_tool_forum/web/jsps/learning/message/topicform.jsp
===================================================================
diff -u -r9d8aadf71d51c3a6eaff3326f2166f833d02a4b1 -rd5fee901f5527e516add11b0ec872521de171133
--- lams_tool_forum/web/jsps/learning/message/topicform.jsp	(.../topicform.jsp)	(revision 9d8aadf71d51c3a6eaff3326f2166f833d02a4b1)
+++ lams_tool_forum/web/jsps/learning/message/topicform.jsp	(.../topicform.jsp)	(revision d5fee901f5527e516add11b0ec872521de171133)
@@ -1,44 +1,30 @@
 <%@ include file="/common/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" maxlength="60" />
-			<br>
-			<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><br>
-				<html:file tabindex="3" property="attachmentFile" /><BR>
-				<html:errors property="message.attachment" />
-			</td>
-		</tr>
-	</c:if>
+<div class="form-group">
+    <label><fmt:message key="message.label.subject" />&nbsp;</label>
+	<html:text size="50" tabindex="1" property="message.subject" maxlength="60"/> &nbsp;
+	<html:errors property="message.subject" />
+</div>
 
-	<tr class="right-buttons">
-		<td>
-			<html:button property="goback" onclick="javascript:location.href='${backToForum}';" styleClass="button" styleId="cancelButton">
-				<fmt:message key="button.cancel" />
-			</html:button>
-			<c:set var="backToForum">
-				<html:rewrite page="/learning/viewForum.do?toolSessionID=${sessionMap.toolSessionID}&hideReflection=${sessionMap.hideReflection}" />
-			</c:set>
-			<html:submit styleClass="button" styleId="submitButton">
-				<fmt:message key="button.submit" />
-			</html:submit>
-		</td>
-	</tr>
+<div class="form-group">
+    <label><fmt:message key="message.label.body" />  *</label><BR/>
+	<%@include file="bodyarea.jsp"%>
+</div>
 
-</table>
+<c:if test="${sessionMap.allowUpload}">
+	<div class="form-group">
+		<label><fmt:message key="message.label.attachment" /></label><BR/>
+		<html:file tabindex="3" property="attachmentFile" /><BR/>
+		<html:errors property="message.attachment" />
+	</div>
+</c:if>
 
-<div class="space-bottom"></div>
+<c:set var="backToForum">
+	<html:rewrite page="/learning/viewForum.do?toolSessionID=${sessionMap.toolSessionID}&hideReflection=${sessionMap.hideReflection}" />
+</c:set>
+<html:button property="goback" onclick="javascript:location.href='${backToForum}';" styleClass="btn btn-default voffset5 pull-left" styleId="cancelButton">
+	<fmt:message key="button.cancel" />
+</html:button>&nbsp;
+<html:submit styleClass="btn btn-primary voffset5 pull-right" styleId="submitButton">
+	<fmt:message key="button.submit" />
+</html:submit>
Index: lams_tool_forum/web/jsps/learning/message/topiclist.jsp
===================================================================
diff -u -r435cf022979c9e8179749b31d5cc0a3f32c8e250 -rd5fee901f5527e516add11b0ec872521de171133
--- lams_tool_forum/web/jsps/learning/message/topiclist.jsp	(.../topiclist.jsp)	(revision 435cf022979c9e8179749b31d5cc0a3f32c8e250)
+++ lams_tool_forum/web/jsps/learning/message/topiclist.jsp	(.../topiclist.jsp)	(revision d5fee901f5527e516add11b0ec872521de171133)
@@ -2,30 +2,53 @@
 <%@ include file="/common/taglibs.jsp"%>
 
 <c:set var="pageSize" value="<%= ForumConstants.DEFAULT_PAGE_SIZE %>"/>
-<table  id="topicTable" cellpadding="0" class="alternative-color" cellspacing="0">
-	<tbody>
+<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>
+
+		<c:set var="disabled" value="" />
+		<c:if test="${sessionMap.finishedLock}">
+			<c:set var="disabled" value="disabled" />
+		</c:if>
+
+		<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="100px">
+			<th width="15%">
 				<fmt:message key="lable.topic.title.startedby" />
 			</th>
-			<th width="60px">
+			<th width="8%">
 				<fmt:message key="lable.topic.title.replies" />
 			</th>
-			<th width="60px">
+			<th width="8%">
 				<fmt:message key="lable.topic.title.repliesnew" />
 			</th>
-			<th width="25%">
+			<th width="20%">
 				<fmt:message key="lable.topic.title.update" />
 			</th>
 			<c:if test="${not sessionMap.allowNewTopics and sessionMap.minimumReply ne 0}">
-				<th>
+				<th  width="8%">
 					&nbsp;
 				</th>
 			</c:if>
 		</tr>
+		</thead>
+		<tbody>
 		<c:forEach items="${topicList}" var="topic">
 			<tr>
 				<td>
@@ -43,7 +66,7 @@
 						</c:choose>
 					</html:link>
 					<c:if test="${topic.hasAttachment}">
-						<img src="<html:rewrite page="/images/paperclip.gif"/>">
+						<i class="fa fa-paperclip"></i>
 					</c:if>
 				</td>
 				<td>
@@ -73,5 +96,7 @@
 				</c:if>
 			</tr>
 		</c:forEach>
-	</tbody>
-</table>
+		</tbody>
+	</table>
+	</div>
+</div>
Index: lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp
===================================================================
diff -u -r2ff38cdf504d51a2590b113023d885069d32645e -rd5fee901f5527e516add11b0ec872521de171133
--- lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp	(.../topicreplyform.jsp)	(revision 2ff38cdf504d51a2590b113023d885069d32645e)
+++ lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp	(.../topicreplyform.jsp)	(revision d5fee901f5527e516add11b0ec872521de171133)
@@ -1,43 +1,36 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<div class="field-name title-space-top">
-	<fmt:message key="message.label.subject" />
-</div>
+<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;
+	<html:errors property="message.subject" />
+  </div>
 
-<html:text size="30" tabindex="1" property="message.subject"
-	maxlength="60" />
-<html:errors property="message.subject" />
-
-<div class="field-name title-space-top">
-	<fmt:message key="message.label.body" />
-	*
+ <div class="form-group">
+    <label><fmt:message key="message.label.body" /> *</label><BR/>
+	<%@include file="bodyarea.jsp"%>
 </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" />
+	 <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">
-		<fmt:message key="label.upload.info">
-			<fmt:param>${sessionMap.uploadMaxFileSize}</fmt:param>
-		</fmt:message>
+		<div style="font-style: italic; margin-top: 10px">
+			<fmt:message key="label.upload.info">
+				<fmt:param>${sessionMap.uploadMaxFileSize}</fmt:param>
+			</fmt:message>
+		</div>
+		<html:errors property="message.attachment" />
 	</div>
-	<html:errors property="message.attachment" />
-
 </c:if>
-<div class="space-bottom-top">
-	<div class="right-buttons">
-		<html:button property="goback" styleId="cancelButton" 
-			onclick="javascript:cancelReply();"
-			styleClass="button">
-			<fmt:message key="button.cancel" />
-		</html:button>
-		<html:submit styleClass="button" styleId="submitButton" >
-			<fmt:message key="button.submit" />
-		</html:submit>
-	</div>
+
+<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>
 </div>
Index: lams_tool_forum/web/jsps/learning/message/topicview.jsp
===================================================================
diff -u -r435cf022979c9e8179749b31d5cc0a3f32c8e250 -rd5fee901f5527e516add11b0ec872521de171133
--- lams_tool_forum/web/jsps/learning/message/topicview.jsp	(.../topicview.jsp)	(revision 435cf022979c9e8179749b31d5cc0a3f32c8e250)
+++ lams_tool_forum/web/jsps/learning/message/topicview.jsp	(.../topicview.jsp)	(revision d5fee901f5527e516add11b0ec872521de171133)
@@ -3,7 +3,7 @@
 
 <c:set var="maxThreadUid" value="0"/>
 <c:set var="messageTablename" value=""/>
-<c:set var="indent" value="30"/>
+<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>
@@ -26,10 +26,10 @@
 	$(".button").click(function (e) {
     	e.stopPropagation();
 	});
-	$(".rating-stars-div").click(function (e) {
+	$(".msg-footer").click(function (e) {
     	e.stopPropagation();
 	});
-	$("#attachments").click(function (e) {
+	$(".attachments").click(function (e) {
     	e.stopPropagation();
 	});
 
@@ -40,14 +40,7 @@
 			// set up the new reply area
 			var replyDiv = document.createElement("div");
 			replyDiv.id = 'reply';
-
-			if ( level == 0 ) {
-				$('#msg'+messageUid).after(replyDiv);
-			} else {				
-				var parentDiv = document.getElementById('msg'+messageUid);
-				parentDiv.appendChild(replyDiv);
-			}
-			
+			$('#pb-msg'+messageUid).after(replyDiv);
 			$(replyDiv).load(url);
 		}
 	}
@@ -57,15 +50,13 @@
 			alert('<fmt:message key="message.complete.or.cancel.edit"/>');
 		} else {
 			// set up the new edit area
-			var parentDiv = document.getElementById('msg'+messageUid);
 			var editDiv = document.createElement("div");
 			editDiv.id = 'edit';
-			parentDiv.appendChild(editDiv);
+			$('#pb-msg'+messageUid).after(editDiv);
 			$(editDiv).load(url);
 		}
 	}
-
-
+	
 </script>
 
 <c:forEach var="msgDto" items="${topicThread}">
@@ -88,7 +79,7 @@
 		</c:if>
 		<c:set var="messageTablename" value="tree${msgDto.message.uid}"/>
 		<div id="thread${msgDto.message.uid}">
-		<table id="${messageTablename}">
+		<table id="${messageTablename}" class="col-xs-12">
 		<tr data-tt-id="${msgDto.message.uid}"><td>	
 	</c:when>
 	<c:otherwise>
@@ -97,6 +88,10 @@
 	</c:choose>
 	
 	<%@ include file="msgview.jsp"%>
+
+	<c:if test='${(msgLevel == 0)}'>
+		<div id="insertTopLevelRepliesHere"></div>
+	</c:if>
 	
 	<c:if test='${(msgLevel >= 1)}'>
 		</td></tr>	
@@ -114,8 +109,8 @@
 	
 <c:set var="pageSize" value="<%= ForumConstants.DEFAULT_PAGE_SIZE %>"/>
 <c:if test='${maxThreadUid > 0 && ! noMorePages}'>
-	<div class="float-right">
+	<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="button"><fmt:message key="label.show.more.messages" /></a>
+	<a href="<c:out value="${more}"/>" class="btn btn-xs btn-default"><fmt:message key="label.show.more.messages" /></a>
 	</div>
 </c:if>
Index: lams_tool_forum/web/jsps/learning/message/topicviewwrapper.jsp
===================================================================
diff -u -r2ef18e4c87e2e7929950dbeb990c6715ef16c0c2 -rd5fee901f5527e516add11b0ec872521de171133
--- lams_tool_forum/web/jsps/learning/message/topicviewwrapper.jsp	(.../topicviewwrapper.jsp)	(revision 2ef18e4c87e2e7929950dbeb990c6715ef16c0c2)
+++ lams_tool_forum/web/jsps/learning/message/topicviewwrapper.jsp	(.../topicviewwrapper.jsp)	(revision d5fee901f5527e516add11b0ec872521de171133)
@@ -11,7 +11,13 @@
 </c:set>
 <c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request" />
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+
+<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="${tool}includes/javascript/jquery.treetable.js"></script>
+<script type="text/javascript" src="${tool}includes/javascript/jquery.jscroll.js"></script>
+<script type="text/javascript" src="${tool}includes/javascript/message.js"></script>
 
 <%@ include file="topicview.jsp"%>
 
Index: lams_tool_forum/web/jsps/learning/notebook.jsp
===================================================================
diff -u -r4df056bf620a49a2e208ce1cf441c102c5f19bb0 -rd5fee901f5527e516add11b0ec872521de171133
--- lams_tool_forum/web/jsps/learning/notebook.jsp	(.../notebook.jsp)	(revision 4df056bf620a49a2e208ce1cf441c102c5f19bb0)
+++ lams_tool_forum/web/jsps/learning/notebook.jsp	(.../notebook.jsp)	(revision d5fee901f5527e516add11b0ec872521de171133)
@@ -17,10 +17,7 @@
 	<html:hidden property="userID" />
 	<html:hidden property="sessionMapID" />
 
-	<div id="content">
-		<h1>
-			<c:out value="${sessionMap.title}" escapeXml="true"/>
-		</h1>
+	<lams:Page type="learner" title="${sessionMap.title}">
 
 		<%@ include file="/common/messages.jsp"%>
 
@@ -32,7 +29,7 @@
 			styleClass="text-area" />
 
 		<div class="space-bottom-top align-right">
-			<html:link  href="#nogo" styleClass="button" styleId="finishButton" onclick="submitForm('finish')">
+			<html:link  href="#nogo" styleClass="btn btn-primary voffset5 pull-right na" styleId="finishButton" onclick="submitForm('finish')">
 				<span class="nextActivity">
 					<c:choose>
 	 					<c:when test="${sessionMap.activityPosition.last}">
@@ -46,5 +43,5 @@
 			</html:link>
 		</div>
 
-	</div>
+	</lams:Page>
 </html:form>
Index: lams_tool_forum/web/jsps/learning/ratingStars.jsp
===================================================================
diff -u -r2ff38cdf504d51a2590b113023d885069d32645e -rd5fee901f5527e516add11b0ec872521de171133
--- lams_tool_forum/web/jsps/learning/ratingStars.jsp	(.../ratingStars.jsp)	(revision 2ff38cdf504d51a2590b113023d885069d32645e)
+++ lams_tool_forum/web/jsps/learning/ratingStars.jsp	(.../ratingStars.jsp)	(revision d5fee901f5527e516add11b0ec872521de171133)
@@ -10,7 +10,7 @@
 </c:choose>
 
 <c:if test="${sessionMap.allowRateMessages}">
-	<div class="rating-stars-div" style="float: left;">
+	<div style="display: inline-block">
 		<div class="${ratingStarsClass} rating-stars-new" data-average="${msgDto.averageRating}" data-id="${messageId}"></div>
 		
 		<div class="rating-stars-caption">
Index: lams_tool_forum/web/jsps/learning/reply.jsp
===================================================================
diff -u -r435cf022979c9e8179749b31d5cc0a3f32c8e250 -rd5fee901f5527e516add11b0ec872521de171133
--- lams_tool_forum/web/jsps/learning/reply.jsp	(.../reply.jsp)	(revision 435cf022979c9e8179749b31d5cc0a3f32c8e250)
+++ lams_tool_forum/web/jsps/learning/reply.jsp	(.../reply.jsp)	(revision d5fee901f5527e516add11b0ec872521de171133)
@@ -1,8 +1,5 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/jquery.js"></script>
-<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/jquery.jRating.js"></script>
-<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/jquery-ui.js"></script>
 <script type="text/javascript" src="<lams:WebAppURL />includes/javascript/message.js"></script>
 
 <script type="text/javascript">
@@ -14,7 +11,6 @@
 	$("#replyForm").keydown(function (e) {
     	e.stopPropagation();
 	});
-	
 
 	$('#replyForm').submit(function() { // catch the form's submit event
 
@@ -42,13 +38,13 @@
         			if ( rootUid ) {
 	        			if ( ! threadDiv) {
     	    				// must have replied to the top level, so show the posting at the top.
-							var threadDiv = document.getElementById('reply');
-							threadDiv.id = 'thread'+messageUid;
-        				} else {
-        					// make sure the old reply form is gone, so if something goes wrong 
-        					// the user won't try to submit it again
-							$('#reply').remove();
-						}
+	        				threadDiv =  document.createElement("div");
+	        				threadDiv.id = 'reply'+messageUid;
+	        				$('#insertTopLevelRepliesHere').after(threadDiv);
+	        			}
+	        			// make sure the old reply form is gone, so if something goes wrong 
+        				// the user won't try to submit it again
+						$('#reply').remove();
         			
 	        			if ( ! threadDiv) {
 	        				alert('<fmt:message key="error.cannot.redisplay.please.refresh"/>');
@@ -59,7 +55,7 @@
 								// don't need to do this if we have started a new thread.
 								if ( threadUid != messageUid ) {
 									$('#tree' + threadUid).treetable("reveal",messageUid);
-									$('#msg'+messageUid).focus();
+									$('#pb-msg'+messageUid).focus();
 								}
 								setupJRating("<c:url value='/learning/rateMessage.do'/>?toolSessionID=${sessionMap.toolSessionID}&sessionMapID=${sessionMapID}");
 								highlightMessage();
@@ -97,15 +93,15 @@
 
 	<html:hidden property="sessionMapID"/>
 	
-	<div id="content">
-	
-		<h2>
+	<div class="container-fluid">
+	<div class="panel panel-default">
+		<div class="panel-heading panel-title">
 			<fmt:message key="title.message.reply" />
-		</h2>
-		
-		<html:errors property="error" />
-				
-		<%@ include file="/jsps/learning/message/topicreplyform.jsp"%>
-	
+		</div>
+		<div class="panel-body">
+			<html:errors property="error" />
+			<%@ include file="/jsps/learning/message/topicreplyform.jsp"%>
+		</div>
 	</div>
+	</div>
 </html:form>
Index: lams_tool_forum/web/jsps/learning/submissionDeadline.jsp
===================================================================
diff -u -r281244f5d518e88719ffc871ac71bb03136cb03e -rd5fee901f5527e516add11b0ec872521de171133
--- lams_tool_forum/web/jsps/learning/submissionDeadline.jsp	(.../submissionDeadline.jsp)	(revision 281244f5d518e88719ffc871ac71bb03136cb03e)
+++ lams_tool_forum/web/jsps/learning/submissionDeadline.jsp	(.../submissionDeadline.jsp)	(revision d5fee901f5527e516add11b0ec872521de171133)
@@ -1,17 +1,14 @@
 <%@ include file="/common/taglibs.jsp"%>
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 
-<div id="content">
+<c:set var="title"><fmt:message key="activity.title" /></c:set>
+<lams:Page type="learner" title="${title}">
 
-	<h1>
-		<fmt:message key="activity.title" />
-	</h1>
-
-	<div class="warning">
+	<lams:Alert type="danger" id="submission-deadline" close="false">
 		<fmt:message key="authoring.info.teacher.set.restriction" >
 			<fmt:param><lams:Date value="${sessionMap.submissionDeadline}" /></fmt:param>
 		</fmt:message>
-	</div>
+	</lams:Alert>
 
 	<div class="space-bottom-top align-right">
 		<c:set var="continue">
@@ -34,14 +31,13 @@
 				test="${sessionMap.reflectOn && (not sessionMap.finishedLock)}">
 				<html:button property="continue"
 					onclick="javascript:location.href='${continue}';"
-					styleClass="button">
+					styleClass="btn btn-primary voffset5 pull-right">
 					<fmt:message key="label.continue" />
 				</html:button>
 			</c:when>
 			<c:otherwise>
 				<html:link href="#nogo"  property="finish" styleId="finish"
-					onclick="submitFinish();" styleClass="button">
-					<span class="nextActivity">
+					onclick="submitFinish();" styleClass="btn btn-primary voffset5 pull-right na">
 						<c:choose>
 		 					<c:when test="${sessionMap.activityPosition.last}">
 		 						<fmt:message key="label.submit" />
@@ -50,10 +46,9 @@
 		 		 				<fmt:message key="label.finish" />
 		 					</c:otherwise>
 		 				</c:choose>
-			 		</span>
 				</html:link>
 			</c:otherwise>
 		</c:choose>
 
 	</div>
-</div>
+</lams:Page>
\ No newline at end of file
Index: lams_tool_forum/web/jsps/learning/viewforum.jsp
===================================================================
diff -u -r2ff38cdf504d51a2590b113023d885069d32645e -rd5fee901f5527e516add11b0ec872521de171133
--- lams_tool_forum/web/jsps/learning/viewforum.jsp	(.../viewforum.jsp)	(revision 2ff38cdf504d51a2590b113023d885069d32645e)
+++ lams_tool_forum/web/jsps/learning/viewforum.jsp	(.../viewforum.jsp)	(revision d5fee901f5527e516add11b0ec872521de171133)
@@ -20,66 +20,59 @@
 	}		
 </script>
 
-<div id="content">
+<lams:Page type="learner" title="${sessionMap.title}">
 
-	<h1 id="forumTitle">
-		<c:out value="${sessionMap.title}" escapeXml="true" />
-	</h1>
-
-	<div class="small-space-top" id="forumInstructions">
+	<div class="panel">
 		<c:out value="${sessionMap.instruction}" escapeXml="false" />
 	</div>
 
+	<!-- Announcements and advanced settings -->
 	<c:if test="${not empty sessionMap.submissionDeadline}">
-		<div class="info">
+		<lams:Alert id="submissionDeadline" type="info" close="true">
 			<fmt:message key="authoring.info.teacher.set.restriction" >
 				<fmt:param><lams:Date value="${sessionMap.submissionDeadline}" /></fmt:param>
 			</fmt:message>
-		</div>
+		</lams:Alert>
 	</c:if>
+
 	<c:if test="${sessionMap.mode == 'author' || sessionMap.mode == 'learner'}">
 		<c:if test="${sessionMap.lockedWhenFinished}">
-			<div class="info">
+			<lams:Alert id="lockWhenFinished" type="info" close="true">
 				<c:choose>
-					<c:when test="${sessionMap.finishedLock}">
-						<fmt:message key="label.responses.locked.reminder" />
-					</c:when>
-					<c:otherwise>
-						<fmt:message key="label.responses.locked" />
-					</c:otherwise>
+				<c:when test="${sessionMap.finishedLock}">
+					<fmt:message key="label.responses.locked.reminder" />
+				</c:when>
+				<c:otherwise>
+					<fmt:message key="label.responses.locked" />
+				</c:otherwise>
 				</c:choose>
-			</div>
+			</lams:Alert>
 		</c:if>
 
-		<c:if test="${not sessionMap.allowNewTopics and (sessionMap.minimumReply ne 0 and sessionMap.maximumReply ne 0)}">
-			<div class="info">
-				<fmt:message key="label.postingLimits.forum.reminder">
-					<fmt:param value="${sessionMap.minimumReply}"/>
-					<fmt:param value="${sessionMap.maximumReply}"/>
-				</fmt:message>
-			</div>
+		<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.forum.reminder">
+							<fmt:param value="${sessionMap.minimumReply}"/>
+							<fmt:param value="${sessionMap.maximumReply}"/>
+						</fmt:message>
+				</c:if>
+				<c:if test="${(sessionMap.minimumReply ne 0 and sessionMap.maximumReply eq 0)}">
+					<fmt:message key="label.postingLimits.forum.reminder.min">
+						<fmt:param value="${sessionMap.minimumReply}"/>
+					</fmt:message>
+				</c:if>			
+				<c:if test="${(sessionMap.minimumReply eq 0 and sessionMap.maximumReply ne 0)}">
+					<fmt:message key="label.postingLimits.forum.reminder.max">
+						<fmt:param value="${sessionMap.maximumReply}"/>
+					</fmt:message>
+				</c:if>
+			</lams:Alert>
 		</c:if>
 		
-		<c:if test="${not sessionMap.allowNewTopics and (sessionMap.minimumReply ne 0 and sessionMap.maximumReply eq 0)}">
-			<div class="info">
-				<fmt:message key="label.postingLimits.forum.reminder.min">
-					<fmt:param value="${sessionMap.minimumReply}"/>
-				</fmt:message>
-			</div>
-		</c:if>
-		
-		<c:if test="${not sessionMap.allowNewTopics and (sessionMap.minimumReply eq 0 and sessionMap.maximumReply ne 0)}">
-			<div class="info">
-				<fmt:message key="label.postingLimits.forum.reminder.max">
-					<fmt:param value="${sessionMap.maximumReply}"/>
-				</fmt:message>
-			</div>
-		</c:if>
-		
 		<!-- Rating announcements -->
 		<c:if test="${sessionMap.allowRateMessages}">
-		
-			<div class="info">
+			<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">
@@ -105,92 +98,83 @@
 				<fmt:message key="label.rateLimits.topic.reminder">
 					<fmt:param value="<span id='numOfRatings'>${sessionMap.numOfRatings}</span>"/>
 				</fmt:message>
-			</div>
-			
+			</lams:Alert>
 		</c:if>	
-		
 	</c:if>
+	<!-- End announcements and advanced settings -->
 
 	<%@ include file="/common/messages.jsp"%>
-	
-	<div class="space-bottom-top">
-		<c:set var="buttonClass" value="button" />
-		<c:if test="${sessionMap.finishedLock}">
-			<c:set var="buttonClass" value="disabled" />
-		</c:if>
 
-		<c:if test='${sessionMap.allowNewTopics}'>
-			<html:button property="newtopic"
-				onclick="javascript:location.href='${newtopic}';"
-				disabled="${sessionMap.finishedLock}" styleClass="${buttonClass}">
-				<fmt:message key="label.newtopic" />
-			</html:button>
-		</c:if>
-
-		<html:button property="refresh" onclick="javascript:location.href='${refresh}';" styleClass="button space-left">
-			<fmt:message key="label.refresh" />
-		</html:button>
-	</div>
-
+	<!-- main UI -->
 	<%@ include file="/jsps/learning/message/topiclist.jsp"%>
+	<!--  end main UI -->
 
+	<!-- Reflection -->
 	<c:if test="${sessionMap.userFinished and sessionMap.reflectOn and !sessionMap.hideReflection}">
-		<div class="small-space-top">
-			<h2><fmt:message key="title.reflection"/></h2>
-			<p>
-				<strong><lams:out value="${sessionMap.reflectInstructions}" escapeHtml="true"/></strong>
-			</p>
-			<div id="reflection">
-			<c:choose>
-				<c:when test="${empty sessionMap.reflectEntry}">
-					<p>
-						<em> <fmt:message key="message.no.reflection.available" /> </em>
-					</p>
-				</c:when>
-				<c:otherwise>
-					<p>
-						<lams:out escapeHtml="true" value="${sessionMap.reflectEntry}" />
-					</p>
-				</c:otherwise>
-			</c:choose>
+		<div class="row no-gutter">
+			<div class="col-xs-12">
+				<div class="panel panel-default">
+					<div class="panel-heading panel-title">
+						<fmt:message key="title.reflection" />
+					</div>
+					<div class="panel-body">
+						<div class="reflectionInstructions">
+							<lams:out value="${sessionMap.reflectInstructions}" escapeHtml="true" />
+						</div>
+						<div class="panel">
+							<c:choose>
+								<c:when test="${empty sessionMap.reflectEntry}">
+									<p>
+										<em> <fmt:message key="message.no.reflection.available" /> </em>
+									</p>
+								</c:when>
+								<c:otherwise>
+									<p>
+										<lams:out escapeHtml="true" value="${sessionMap.reflectEntry}" />
+									</p>
+								</c:otherwise>
+							</c:choose>
+						</div>
+						<c:if test='${sessionMap.mode != "teacher"}'>
+							<html:button property="continue"
+								onclick="javascript:location.href='${continue}';"
+								styleClass="btn btn-default pull-left" styleId="editReflection">
+								<fmt:message key="label.edit" />
+							</html:button>
+						</c:if>
+					</div>
+				</div>
 			</div>
-			<c:if test='${sessionMap.mode != "teacher"}'>
+		</div>
+	</c:if>
+	<!-- End Reflection -->
+
+	<c:if test='${(sessionMap.mode != "teacher") && sessionMap.isMinRatingsCompleted}'>
+		<c:choose>
+			<c:when	test="${sessionMap.reflectOn && (not sessionMap.userFinished)}">
 				<html:button property="continue"
 					onclick="javascript:location.href='${continue}';"
-					styleClass="button" styleId="editReflection">
-					<fmt:message key="label.edit" />
+					styleClass="btn btn-primary voffset5 pull-right">
+					<fmt:message key="label.continue" />
 				</html:button>
-			</c:if>
-		</div>
-	</c:if>
+			</c:when>
 
-	<div align="right" class="space-bottom-top" id="rightButtons">
-		<c:if test='${(sessionMap.mode != "teacher") && sessionMap.isMinRatingsCompleted}'>
-			<c:choose>
-				<c:when	test="${sessionMap.reflectOn && (not sessionMap.userFinished)}">
-					<html:button property="continue"
-						onclick="javascript:location.href='${continue}';"
-						styleClass="button">
-						<fmt:message key="label.continue" />
-					</html:button>
-				</c:when>
+			<c:otherwise>
+				<html:link href="#nogo" property="finish" styleId="finishButton" onclick="submitFinish();" styleClass="btn btn-primary voffset5 pull-right na">
+					<span class="nextActivity">
+						<c:choose>
+		 					<c:when test="${sessionMap.activityPosition.last}">
+		 						<fmt:message key="label.submit" />
+		 					</c:when>
+		 					<c:otherwise>
+		 		 				<fmt:message key="label.finish" />
+		 					</c:otherwise>
+		 				</c:choose>
+					</span>
+				</html:link>
+			</c:otherwise>
 
-				<c:otherwise>
-					<html:link href="#nogo" property="finish" styleId="finishButton" onclick="submitFinish();" styleClass="button">
-						<span class="nextActivity">
-							<c:choose>
-			 					<c:when test="${sessionMap.activityPosition.last}">
-			 						<fmt:message key="label.submit" />
-			 					</c:when>
-			 					<c:otherwise>
-			 		 				<fmt:message key="label.finish" />
-			 					</c:otherwise>
-			 				</c:choose>
-						</span>
-					</html:link>
-				</c:otherwise>
+		</c:choose>
+	</c:if>
 
-			</c:choose>
-		</c:if>
-	</div>
-</div>
+</lams:Page>
Index: lams_tool_forum/web/jsps/learning/viewtopic.jsp
===================================================================
diff -u -r5e63656a12c02f7476564e278b43ff4ce86ac930 -rd5fee901f5527e516add11b0ec872521de171133
--- lams_tool_forum/web/jsps/learning/viewtopic.jsp	(.../viewtopic.jsp)	(revision 5e63656a12c02f7476564e278b43ff4ce86ac930)
+++ lams_tool_forum/web/jsps/learning/viewtopic.jsp	(.../viewtopic.jsp)	(revision d5fee901f5527e516add11b0ec872521de171133)
@@ -35,9 +35,10 @@
 			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="${tool}includes/javascript/jquery.treetable.js"></script>
 		<script type="text/javascript" src="${tool}includes/javascript/message.js"></script>
 		<script type="text/javascript">
 			$(document).ready(function(){
@@ -56,75 +57,41 @@
 		
 	</lams:head>
 	<body class="stripes">
-		<div id="content">
+		<lams:Page type="learner" title="${sessionMap.title}">
 
-			<h1>
-				<c:out value="${sessionMap.title}" escapeXml="true"/>
-			</h1>
-		
-			<div>
-				<div class="right-buttons">
-				
-					<c:set var="refreshTopicURL">
-					</c:set>
-					<html:button property="refresh"
-						onclick="javascript:refreshTopic();"
-						styleClass="button">
-						<fmt:message key="label.refresh" />
-					</html:button>
-					
-					<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="button">
-						<fmt:message key="label.back.to.forum" />
-					</html:button>
-				</div>
-				<h2>
-					<fmt:message key="title.message.view.topic" />
-				</h2>
-		
-			</div>
-		
+			<!-- Announcements and advanced settings -->
 			<c:if test="${sessionMap.mode == 'author' || sessionMap.mode == 'learner'}">
-				<c:choose>
-				  	<c:when test="${not sessionMap.allowNewTopics and (sessionMap.minimumReply ne 0 and sessionMap.maximumReply ne 0)}">
-						<div class="info">
+			
+				<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>
-						</div>
-		           </c:when> 
-		           <c:when test="${not sessionMap.allowNewTopics and (sessionMap.minimumReply ne 0 or sessionMap.maximumReply eq 0)}">
-		           		<div class="info">
+					</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>
-		                </div>
-		           </c:when> 
-		           <c:when test="${not sessionMap.allowNewTopics and (sessionMap.minimumReply eq 0 or sessionMap.maximumReply ne 0)}">
-		                <div class="info">
+					</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>
-		                </div>
-		            </c:when>
-		    	</c:choose>
-		    	
+					</c:if>
+					</lams:Alert>
+				</c:if>
+				
 				<!-- Rating announcements -->
 				<c:if test="${sessionMap.allowRateMessages}">
-					<div class="info">
-					
+					<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">
@@ -150,46 +117,48 @@
 						<fmt:message key="label.rateLimits.topic.reminder">
 							<fmt:param value="<span id='numOfRatings'>${sessionMap.numOfRatings}</span>"/>
 						</fmt:message>
-						
-					</div>
-				</c:if>
-				    	
-			</c:if>
-			<br>
-			
-			<div class="space-bottom">
-			<div class="scroll" >
-			<%@ include file="message/topicview.jsp"%>
+		
+					</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>
-			<script>
-				<c:set var="loading_animation">${lams}images/ajax-loader.gif</c:set>
-				<c:set var="loading_words"><fmt:message key="label.loading.messages" /></c:set>
-				$('.scroll' ).jscroll({loadingHtml: '<img src="${loading_animation}" alt="${loading_words}" />${loading_words}',padding:30,autoTrigger:true,callback:setupJRatingSetPath});
-			</script>
-			
-			<c:set var="refreshTopicURL">
+			<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>
-			
-			<div>
-				<div class="right-buttons">
-					<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="button">
-						<fmt:message key="label.back.to.forum" />
-					</html:button>
-				</div>
-		
-				<a href="javascript:refreshTopic();" class="button"> <fmt:message
-						key="label.refresh" /> </a>
+			<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>
+		
+		${buttonPanel}
+
+		<div class="scroll" >
+		<%@ include file="message/topicview.jsp"%>
 		</div>
+		<script>
+			<c:set var="loading_animation">${lams}images/ajax-loader.gif</c:set>
+			<c:set var="loading_words"><fmt:message key="label.loading.messages" /></c:set>
+			$('.scroll' ).jscroll({loadingHtml: '<img src="${loading_animation}" alt="${loading_words}" />${loading_words}',padding:30,autoTrigger:true,callback:setupJRatingSetPath});
+		</script>
+			
+		${buttonPanel}
 
+	</lams:Page>
+
 	</body>
 </lams:html>