Index: lams_tool_nb/web/WEB-INF/tags/CommentsAuthor.tag
===================================================================
diff -u -r0f43a76093ebdfc8dfde3de70990efbe5cad56ee -r91462036d66d1307967706c1db4b66062726595e
--- lams_tool_nb/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 0f43a76093ebdfc8dfde3de70990efbe5cad56ee)
+++ lams_tool_nb/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 91462036d66d1307967706c1db4b66062726595e)
@@ -24,18 +24,18 @@
 	<c:set var="likeDislikeLabelKey" value="advanced.comments.like.and.dislike" />
 </c:if>
 
-<p class="voffset5">
+<div class="checkbox">
+	<label>
 	<html:checkbox property="${allowCommentsVariableName}" value="1"
-		styleClass="noBorder" styleId="${allowCommentsVariableName}">
-		&nbsp;<fmt:message key="${allowCommentLabelKey}" />
+		styleId="${allowCommentsVariableName}">
 	</html:checkbox>
-</p>
-	<div style="padding-left: 20px" id="likedislike">
-	<p>
+	<fmt:message key="${allowCommentLabelKey}"/>
+	</label>
+</div>
+<div class="loffset20" id="likedislike">
 		<html:radio property="${likeDislikeVariableName}" value="false" />&nbsp;<fmt:message key="${likeOnlyCommentLabelKey}" /> &nbsp;
 		<html:radio property="${likeDislikeVariableName}" value="true" />&nbsp;<fmt:message key="${likeDislikeLabelKey}" /> 
-	</p>
-	</div>
+</div>
 
 <script>
 jQuery( document ).ready(function( $ ) {
Index: lams_tool_nb/web/authoring/advance.jsp
===================================================================
diff -u -r0f43a76093ebdfc8dfde3de70990efbe5cad56ee -r91462036d66d1307967706c1db4b66062726595e
--- lams_tool_nb/web/authoring/advance.jsp	(.../advance.jsp)	(revision 0f43a76093ebdfc8dfde3de70990efbe5cad56ee)
+++ lams_tool_nb/web/authoring/advance.jsp	(.../advance.jsp)	(revision 91462036d66d1307967706c1db4b66062726595e)
@@ -4,15 +4,16 @@
 
 <lams:CommentsAuthor/>
 
-<div class="form-group">
+<div class="checkbox">
+	<label for="reflectOnActivity">
     <html:checkbox property="reflectOnActivity" value="1"
 		styleClass="noBorder" styleId="reflectOnActivity"></html:checkbox>
-	<label for="reflectOnActivity">&nbsp;
 		<fmt:message key="advanced.reflectOnActivity" />
 	</label>
-	<BR/>
-	<html:textarea property="reflectInstructions" cols="60" rows="3"  styleId="reflectInstructions"/>
 </div>
+<div class="form-group">
+	<html:textarea property="reflectInstructions" cols="60" rows="3"  styleId="reflectInstructions" styleClass="form-control"/>
+</div>
 
 <script type="text/javascript">
 <!--
Index: lams_tool_nb/web/authoring/basic.jsp
===================================================================
diff -u -r0f43a76093ebdfc8dfde3de70990efbe5cad56ee -r91462036d66d1307967706c1db4b66062726595e
--- lams_tool_nb/web/authoring/basic.jsp	(.../basic.jsp)	(revision 0f43a76093ebdfc8dfde3de70990efbe5cad56ee)
+++ lams_tool_nb/web/authoring/basic.jsp	(.../basic.jsp)	(revision 91462036d66d1307967706c1db4b66062726595e)
@@ -2,7 +2,7 @@
 <!-- Basic Tab Content  -->
 <div class="form-group">
     <label for="title"><fmt:message key="basic.title"/></label>
-    <html:text property="title" style="width: 99%;"/>
+    <html:text property="title" styleClass="form-control"/>
 </div>
 
 <div class="form-group">
Index: lams_tool_nb/web/learnerContent.jsp
===================================================================
diff -u -r8b5940710ceac2c67320a1954dea1c58120c78b1 -r91462036d66d1307967706c1db4b66062726595e
--- lams_tool_nb/web/learnerContent.jsp	(.../learnerContent.jsp)	(revision 8b5940710ceac2c67320a1954dea1c58120c78b1)
+++ lams_tool_nb/web/learnerContent.jsp	(.../learnerContent.jsp)	(revision 91462036d66d1307967706c1db4b66062726595e)
@@ -52,7 +52,8 @@
 		</c:if>
 
 		<c:if test="${allowComments}">
-			<lams:Comments toolSessionId="${NbLearnerForm.toolSessionID}"
+			<hr/>
+			<lams:Comments toolSessionId="${NbLearnerForm.toolSessionID}" 
 				toolSignature="<%=NoticeboardConstants.TOOL_SIGNATURE%>" likeAndDislike="${likeAndDislike}" />
 		</c:if>
 
Index: lams_tool_nb/web/monitoring/comments.jsp
===================================================================
diff -u -r0815134d5864fcbff49cce0fe1085cbf7635e1ec -r91462036d66d1307967706c1db4b66062726595e
--- lams_tool_nb/web/monitoring/comments.jsp	(.../comments.jsp)	(revision 0815134d5864fcbff49cce0fe1085cbf7635e1ec)
+++ lams_tool_nb/web/monitoring/comments.jsp	(.../comments.jsp)	(revision 91462036d66d1307967706c1db4b66062726595e)
@@ -23,9 +23,7 @@
 	<c:set var="title"><fmt:message key="activity.title" />: <fmt:message key="label.view.comments" /></c:set>
 	<lams:Page title="${title}" type="learner">
 
-	<div id="content">
-		<lams:Comments toolSessionId="${requestScope.toolSessionID}" toolSignature="<%=NoticeboardConstants.TOOL_SIGNATURE%>" mode="teacher"/>
-	</div>
+	<lams:Comments toolSessionId="${requestScope.toolSessionID}" toolSignature="<%=NoticeboardConstants.TOOL_SIGNATURE%>" mode="teacher"/>
 	
 	</lams:Page>