Index: lams_tool_forum/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.55.2.11 -r1.55.2.12
--- lams_tool_forum/conf/language/lams/ApplicationResources.properties	11 May 2016 07:14:58 -0000	1.55.2.11
+++ lams_tool_forum/conf/language/lams/ApplicationResources.properties	23 Jun 2016 03:56:35 -0000	1.55.2.12
@@ -175,7 +175,7 @@
 event.mark.release.body  =An instructor released marks in a Forum activity in LAMS.\nYour marks are:\n\n{0}\nThis message was sent automatically, please do not reply to it.
 event.mark.release.mark  =For the message titled "{0}" posted on {1} the mark is {2}. \n
 authoring.tab.conditions  =Conditions
-label.authoring.heading.conditions.desc  =Please enter conditions for Forum
+label.authoring.heading.conditions.desc  =Please enter \u0192conditions for Forum
 label.authoring.heading.conditions  =Conditions
 label.authoring.conditions.add.condition  =Add condition
 label.authoring.conditions.list.title  =Conditions
@@ -246,6 +246,9 @@
 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
+label.posting.options=Posting Options
+label.activity.completion=Activity Completion
+label.notifications=Notifications
+label.rate=Rate
 
-
 #======= End labels: Exported 239 labels for en AU =====
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_forum/web/WEB-INF/tags/SimplePanel.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_forum/web/WEB-INF/tlds/lams/lams.tld
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/WEB-INF/tlds/lams/lams.tld,v
diff -u -r1.3.2.4 -r1.3.2.5
--- lams_tool_forum/web/WEB-INF/tlds/lams/lams.tld	9 May 2016 12:03:50 -0000	1.3.2.4
+++ lams_tool_forum/web/WEB-INF/tlds/lams/lams.tld	23 Jun 2016 03:56:35 -0000	1.3.2.5
@@ -463,6 +463,10 @@
    		<name>RestrictedUsageAccordian</name>
    		<path>/WEB-INF/tags/RestrictedUsageAccordian.tag</path>
    	</tag-file>
+  	<tag-file>
+	    <name>SimplePanel</name>
+		<path>/WEB-INF/tags/SimplePanel.tag</path>
+   	</tag-file>
    	<tag-file>
 	    <name>ImgButtonWrapper</name>
 		<path>/WEB-INF/tags/ImgButtonWrapper.tag</path>
Index: lams_tool_forum/web/jsps/authoring/advance.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/authoring/advance.jsp,v
diff -u -r1.31.2.4 -r1.31.2.5
--- lams_tool_forum/web/jsps/authoring/advance.jsp	9 May 2016 12:03:49 -0000	1.31.2.4
+++ lams_tool_forum/web/jsps/authoring/advance.jsp	23 Jun 2016 03:56:35 -0000	1.31.2.5
@@ -2,68 +2,21 @@
 
 <!--   Advance Tab Content    -->
 
-<div class="checkbox">
-<label for="lockWhenFinished"><html:checkbox property="forum.lockWhenFinished" styleId="lockWhenFinished" />
-<fmt:message key="label.authoring.advance.lock.on.finished" /></label>
-</div>
+<lams:SimplePanel titleKey="label.posting.options" titleHelpURL="http://www.smh.com.au/">
 
 <div class="checkbox">
-<label for="allowEdit"><html:checkbox property="forum.allowEdit" styleId="allowEdit" />
-<fmt:message key="label.authoring.advance.allow.edit" /></label>
+<label for="rich-editor"><html:checkbox property="forum.allowRichEditor" styleId="rich-editor"/>
+<fmt:message key="label.authoring.advance.use.richeditor" /></label>
 </div>
 
 <div class="checkbox">
-<label for="allowRateMessages"><html:checkbox property="forum.allowRateMessages" styleId="allowRateMessages"  onclick="checkRating()"/>
-<fmt:message key="label.authoring.advance.allow.rate.postings" /></label>
-</div>
-
-<div class="form-inline loffset20">
-	<div class="form-group">
-	<label for="minimumRate"><fmt:message key="label.authoring.advance.minimum.reply" /></label>
-	<html:select property="forum.minimumRate" styleId="minimumRate"  onmouseup="validateRatings(true);" styleClass="form-control input-sm">
-		<html:option value="0">
-			<fmt:message key="label.authoring.advance.no.minimum" />
-		</html:option>
-		<html:option value="1">1</html:option>
-		<html:option value="2">2</html:option>
-		<html:option value="3">3</html:option>
-		<html:option value="4">4</html:option>
-		<html:option value="5">5</html:option>
-		<html:option value="6">6</html:option>
-		<html:option value="7">7</html:option>
-		<html:option value="8">8</html:option>
-		<html:option value="9">9</html:option>
-		<html:option value="10">10</html:option>
-	</html:select>
-	</div>
-	<div class="form-group">
-	<label for="maximumRate"><fmt:message key="label.authoring.advance.maximum.reply" /></label>
-	<html:select property="forum.maximumRate" styleId="maximumRate"   onmouseup="validateRatings(false);"  styleClass="form-control input-sm">
-		<html:option value="0">
-			<fmt:message key="label.authoring.advance.no.maximum" />
-		</html:option>
-		<html:option value="1">1</html:option>
-		<html:option value="2">2</html:option>
-		<html:option value="3">3</html:option>
-		<html:option value="4">4</html:option>
-		<html:option value="5">5</html:option>
-		<html:option value="6">6</html:option>
-		<html:option value="7">7</html:option>
-		<html:option value="8">8</html:option>
-		<html:option value="9">9</html:option>
-		<html:option value="10">10</html:option>
-	</html:select>
-	</div>
-</div>
-
-<div class="checkbox">
 <label for="allow-upload"><html:checkbox property="forum.allowUpload" styleId="allow-upload"/>
 <fmt:message key="label.authoring.advance.allow.upload" /></label>
 </div>
 
 <div class="checkbox">
-<label for="rich-editor"><html:checkbox property="forum.allowRichEditor" styleId="rich-editor"/>
-<fmt:message key="label.authoring.advance.use.richeditor" /></label>
+<label for="allowEdit"><html:checkbox property="forum.allowEdit" styleId="allowEdit" />
+<fmt:message key="label.authoring.advance.allow.edit" /></label>
 </div>
 
 <div class="checkbox">
@@ -79,6 +32,115 @@
 <html:text property="forum.maxCharacters" styleId="max-characters"  styleClass="form-control form-control-inline input-sm"/>
 </div>
 
+<div class="panel panel-default">
+<div class="panel-body panel-body-sm">
+
+<div class="checkbox">
+<label for="allowRateMessages"><html:checkbox property="forum.allowRateMessages" styleId="allowRateMessages"  onclick="checkRating()"/>
+<fmt:message key="label.authoring.advance.allow.rate.postings" /></label>
+</div>
+
+	<div class="form-inline loffset20">
+		<div class="form-group">
+		<label for="minimumRate"><fmt:message key="label.authoring.advance.minimum.reply" /></label>
+		<html:select property="forum.minimumRate" styleId="minimumRate"  onmouseup="validateRatings(true);" styleClass="form-control input-sm">
+			<html:option value="0">
+				<fmt:message key="label.authoring.advance.no.minimum" />
+			</html:option>
+			<html:option value="1">1</html:option>
+			<html:option value="2">2</html:option>
+			<html:option value="3">3</html:option>
+			<html:option value="4">4</html:option>
+			<html:option value="5">5</html:option>
+			<html:option value="6">6</html:option>
+			<html:option value="7">7</html:option>
+			<html:option value="8">8</html:option>
+			<html:option value="9">9</html:option>
+			<html:option value="10">10</html:option>
+		</html:select>
+		</div>
+		<div class="form-group">
+		<label for="maximumRate"><fmt:message key="label.authoring.advance.maximum.reply" /></label>
+		<html:select property="forum.maximumRate" styleId="maximumRate"   onmouseup="validateRatings(false);"  styleClass="form-control input-sm">
+			<html:option value="0">
+				<fmt:message key="label.authoring.advance.no.maximum" />
+			</html:option>
+			<html:option value="1">1</html:option>
+			<html:option value="2">2</html:option>
+			<html:option value="3">3</html:option>
+			<html:option value="4">4</html:option>
+			<html:option value="5">5</html:option>
+			<html:option value="6">6</html:option>
+			<html:option value="7">7</html:option>
+			<html:option value="8">8</html:option>
+			<html:option value="9">9</html:option>
+			<html:option value="10">10</html:option>
+		</html:select>
+		</div>
+	</div>
+</div>
+</div>
+
+<div class="panel panel-default">
+<div class="panel-body panel-body-sm">
+	<fmt:message key="message.posting.limiting" />
+	<div class="radio">
+	<label for="allowNewTopic1">
+	<html:radio property="forum.allowNewTopic" value="true"	onclick="allowNewTopic()" styleId="allowNewTopic1"/>
+	<fmt:message key="label.authoring.advance.allow.new.topics" />
+	</label>
+	</div>
+	
+	<div class="radio">
+	<label for="allowNewTopic2">
+	<html:radio property="forum.allowNewTopic" value="false" onclick="allowNewTopic()" styleId="allowNewTopic2"/>
+	<fmt:message key="label.authoring.advance.number.reply" />
+	</label>
+	</div>
+	
+	<div class="form-inline loffset20">
+		<div class="form-group">
+		<label for="minimumReply"><fmt:message key="label.authoring.advance.minimum.reply" /></label>
+		<html:select property="forum.minimumReply" styleId="minimumReply" styleClass="form-control input-sm">
+			<html:option value="0">
+				<fmt:message key="label.authoring.advance.no.minimum" />
+			</html:option>
+			<html:option value="1">1</html:option>
+			<html:option value="2">2</html:option>
+			<html:option value="3">3</html:option>
+			<html:option value="4">4</html:option>
+			<html:option value="5">5</html:option>
+			<html:option value="6">6</html:option>
+			<html:option value="7">7</html:option>
+			<html:option value="8">8</html:option>
+			<html:option value="9">9</html:option>
+			<html:option value="10">10</html:option>
+		</html:select>
+		</div>
+		<div class="form-group">
+		<label for="maximumReply"><fmt:message key="label.authoring.advance.maximum.reply" /></label>
+		<html:select property="forum.maximumReply" styleId="maximumReply" styleClass="form-control input-sm">
+			<html:option value="0">
+				<fmt:message key="label.authoring.advance.no.maximum" />
+			</html:option>
+			<html:option value="1">1</html:option>
+			<html:option value="2">2</html:option>
+			<html:option value="3">3</html:option>
+			<html:option value="4">4</html:option>
+			<html:option value="5">5</html:option>
+			<html:option value="6">6</html:option>
+			<html:option value="7">7</html:option>
+			<html:option value="8">8</html:option>
+			<html:option value="9">9</html:option>
+			<html:option value="10">10</html:option>
+		</html:select>
+		</div>
+	</div>
+</div>
+</div>
+</lams:SimplePanel>
+
+<lams:SimplePanel titleKey="label.notifications">
 <div class="form-group">
 <label><fmt:message key="label.authoring.advanced.send.emails.to" /></label>
 <div class="form-inline">
@@ -97,8 +159,15 @@
 <label for="notifyLearnersOnMarkRelease"><html:checkbox property="forum.notifyLearnersOnMarkRelease" styleId="notifyLearnersOnMarkRelease"/>
 <fmt:message key="label.authoring.advanced.notify.mark.release" /></label>
 </div>
+</lams:SimplePanel>
 
+<lams:SimplePanel titleKey="label.activity.completion">
 <div class="checkbox">
+<label for="lockWhenFinished"><html:checkbox property="forum.lockWhenFinished" styleId="lockWhenFinished" />
+<fmt:message key="label.authoring.advance.lock.on.finished" /></label>
+</div>
+
+<div class="checkbox">
 <label for="reflectOn"><html:checkbox property="forum.reflectOnActivity"	styleId="reflectOn"/>
 <fmt:message key="advanced.reflectOnActivity" /></label>
 </div>
@@ -124,64 +193,8 @@
 	ra.onkeyup = turnOnRefect;
 </script>
 
-<h4>
-	<fmt:message key="message.posting.limiting" />
-</h4>
+</lams:SimplePanel>
 
-<div class="radio">
-<label for="allowNewTopic1">
-<html:radio property="forum.allowNewTopic" value="true"	onclick="allowNewTopic()" styleId="allowNewTopic1"/>
-<fmt:message key="label.authoring.advance.allow.new.topics" />
-</label>
-</div>
-
-<div class="radio">
-<label for="allowNewTopic2">
-<html:radio property="forum.allowNewTopic" value="false" onclick="allowNewTopic()" styleId="allowNewTopic2"/>
-<fmt:message key="label.authoring.advance.number.reply" />
-</label>
-</div>
-
-<div class="form-inline loffset20">
-	<div class="form-group">
-	<label for="minimumReply"><fmt:message key="label.authoring.advance.minimum.reply" /></label>
-	<html:select property="forum.minimumReply" styleId="minimumReply" styleClass="form-control input-sm">
-		<html:option value="0">
-			<fmt:message key="label.authoring.advance.no.minimum" />
-		</html:option>
-		<html:option value="1">1</html:option>
-		<html:option value="2">2</html:option>
-		<html:option value="3">3</html:option>
-		<html:option value="4">4</html:option>
-		<html:option value="5">5</html:option>
-		<html:option value="6">6</html:option>
-		<html:option value="7">7</html:option>
-		<html:option value="8">8</html:option>
-		<html:option value="9">9</html:option>
-		<html:option value="10">10</html:option>
-	</html:select>
-	</div>
-	<div class="form-group">
-	<label for="maximumReply"><fmt:message key="label.authoring.advance.maximum.reply" /></label>
-	<fmt:message key="label.authoring.advance.maximum.reply" />
-	<html:select property="forum.maximumReply" styleId="maximumReply" styleClass="form-control input-sm">
-		<html:option value="0">
-			<fmt:message key="label.authoring.advance.no.maximum" />
-		</html:option>
-		<html:option value="1">1</html:option>
-		<html:option value="2">2</html:option>
-		<html:option value="3">3</html:option>
-		<html:option value="4">4</html:option>
-		<html:option value="5">5</html:option>
-		<html:option value="6">6</html:option>
-		<html:option value="7">7</html:option>
-		<html:option value="8">8</html:option>
-		<html:option value="9">9</html:option>
-		<html:option value="10">10</html:option>
-	</html:select>
-	</div>
-</div>
-
 <script type="text/javascript">
 
 	var limitedMinCharacters = document.getElementById("limited-min-characters");