Index: lams_tool_forum/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rd5fee901f5527e516add11b0ec872521de171133 -rf7f47f902db6eae297429b67c683540199704f13
--- lams_tool_forum/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d5fee901f5527e516add11b0ec872521de171133)
+++ lams_tool_forum/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f7f47f902db6eae297429b67c683540199704f13)
@@ -31,6 +31,6 @@
 				</div>
 			</div>
 		</div>
-		<! -- End content container -->
+		<!-- End content container -->
 	</div>
 </div>
Index: lams_tool_forum/web/jsps/learning/message/msgview.jsp
===================================================================
diff -u -rd3a9876dc1ffb96feebcd861473dd3339e83966e -rf7f47f902db6eae297429b67c683540199704f13
--- lams_tool_forum/web/jsps/learning/message/msgview.jsp	(.../msgview.jsp)	(revision d3a9876dc1ffb96feebcd861473dd3339e83966e)
+++ lams_tool_forum/web/jsps/learning/message/msgview.jsp	(.../msgview.jsp)	(revision f7f47f902db6eae297429b67c683540199704f13)
@@ -164,9 +164,13 @@
 				</c:if>
 			</c:if>
 
-		</div>
-	</div>
+		</div> <!--  end msg-footer -->
+	</div> <!--  end panel-body -->
+</div> <!--  end panel -->
+
+<%-- Close the 2 divs from the choose --%> 
 </div>
+</div>
 
 <script type="text/javascript">
 		jQuery(document).ready(function() {
Index: lams_tool_forum/web/jsps/learning/message/topiclist.jsp
===================================================================
diff -u -rd3a9876dc1ffb96feebcd861473dd3339e83966e -rf7f47f902db6eae297429b67c683540199704f13
--- lams_tool_forum/web/jsps/learning/message/topiclist.jsp	(.../topiclist.jsp)	(revision d3a9876dc1ffb96feebcd861473dd3339e83966e)
+++ lams_tool_forum/web/jsps/learning/message/topiclist.jsp	(.../topiclist.jsp)	(revision f7f47f902db6eae297429b67c683540199704f13)
@@ -75,9 +75,10 @@
 			</table>
 		</div>
 	</div>
+</div>
 
-	<script type="text/javascript">
-		jQuery(document).ready(function() {
-			jQuery("time.timeago").timeago();
-		});
-	</script>
\ No newline at end of file
+<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/topicview.jsp
===================================================================
diff -u -rd3a9876dc1ffb96feebcd861473dd3339e83966e -rf7f47f902db6eae297429b67c683540199704f13
--- lams_tool_forum/web/jsps/learning/message/topicview.jsp	(.../topicview.jsp)	(revision d3a9876dc1ffb96feebcd861473dd3339e83966e)
+++ lams_tool_forum/web/jsps/learning/message/topicview.jsp	(.../topicview.jsp)	(revision f7f47f902db6eae297429b67c683540199704f13)
@@ -65,54 +65,63 @@
 	
 </script>
 
-<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:if>
-
-	<c:choose>
-		<c:when test='${(msgLevel == 1)}'>
+	<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:if>
+	
+		<c:choose>
+			<c:when test='${(msgLevel == 1)}'>
 			<%-- same test & command appears at bottom of script --%>
 			<c:if test='${messageTablename != ""}'>
 				</table>
 				<script> 
 				$("#${messageTablename}").treetable({${tableCommand}});
-			</script>
-				
+				</script>
+				 <!--  end thread ${messageTablename} -->	
 			</c:if>
 			<c:set var="messageTablename" value="tree${msgDto.message.uid}" />
-			<div id="thread${msgDto.message.uid}">
+				<!--  start thread  -->
+				<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:forEach>
-
-					<c:if test='${messageTablename != ""}'>
-				</table>
-				<script>
+					<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:forEach>
+	
+	<c:if test='${messageTablename != ""}'>	
+		</table>
+		<script>
 			$("#${messageTablename}").treetable({${tableCommand}});
 		</script>
-			</div>
-			</c:if>
+		</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
+	<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/notebook.jsp
===================================================================
diff -u -rd5fee901f5527e516add11b0ec872521de171133 -rf7f47f902db6eae297429b67c683540199704f13
--- lams_tool_forum/web/jsps/learning/notebook.jsp	(.../notebook.jsp)	(revision d5fee901f5527e516add11b0ec872521de171133)
+++ lams_tool_forum/web/jsps/learning/notebook.jsp	(.../notebook.jsp)	(revision f7f47f902db6eae297429b67c683540199704f13)
@@ -25,8 +25,7 @@
 			<lams:out value="${sessionMap.reflectInstructions}" escapeHtml="true" />
 		</p>
 
-		<html:textarea cols="52" rows="6" property="entryText"
-			styleClass="text-area" />
+		<html:textarea styleId="focused" rows="5" property="entryText" styleClass="form-control"></html:textarea>
 
 		<div class="space-bottom-top align-right">
 			<html:link  href="#nogo" styleClass="btn btn-primary voffset5 pull-right na" styleId="finishButton" onclick="submitForm('finish')">
Index: lams_tool_forum/web/jsps/learning/viewforum.jsp
===================================================================
diff -u -rd5fee901f5527e516add11b0ec872521de171133 -rf7f47f902db6eae297429b67c683540199704f13
--- lams_tool_forum/web/jsps/learning/viewforum.jsp	(.../viewforum.jsp)	(revision d5fee901f5527e516add11b0ec872521de171133)
+++ lams_tool_forum/web/jsps/learning/viewforum.jsp	(.../viewforum.jsp)	(revision f7f47f902db6eae297429b67c683540199704f13)
@@ -111,39 +111,35 @@
 
 	<!-- Reflection -->
 	<c:if test="${sessionMap.userFinished and sessionMap.reflectOn and !sessionMap.hideReflection}">
-		<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 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>
 	</c:if>
Index: lams_tool_forum/web/jsps/learning/viewtopic.jsp
===================================================================
diff -u -rd3a9876dc1ffb96feebcd861473dd3339e83966e -rf7f47f902db6eae297429b67c683540199704f13
--- lams_tool_forum/web/jsps/learning/viewtopic.jsp	(.../viewtopic.jsp)	(revision d3a9876dc1ffb96feebcd861473dd3339e83966e)
+++ lams_tool_forum/web/jsps/learning/viewtopic.jsp	(.../viewtopic.jsp)	(revision f7f47f902db6eae297429b67c683540199704f13)
@@ -126,6 +126,7 @@
 
 		<c:set var="buttonPanel">
 			<c:set var="refreshTopicURL"></c:set>
+				<!--  Button Panel -->
 				<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
@@ -141,6 +142,7 @@
 						</html:button>
 					</div>
 				</div>
+				<!--  Button Panel -->
 		</c:set>
 		
 		${buttonPanel}