Index: lams_central/web/authoring/template/tbl/appexAssessment.jsp
===================================================================
diff -u -rd8e3d476c866737741923397fc21dce88cd2de9e -r766973f2a21ca668667914744418c4c25dc031e3
--- lams_central/web/authoring/template/tbl/appexAssessment.jsp	(.../appexAssessment.jsp)	(revision d8e3d476c866737741923397fc21dce88cd2de9e)
+++ lams_central/web/authoring/template/tbl/appexAssessment.jsp	(.../appexAssessment.jsp)	(revision 766973f2a21ca668667914744418c4c25dc031e3)
@@ -94,23 +94,8 @@
 			</div>
 		</div>
 		
-		<div class="space-top space-sides space-bottom">
-			<div class="checkbox">
-				<label for="divappex${appexNumber}NB">
-					<input name="divappex${appexNumber}NB" id="divappex${appexNumber}NB" type="checkbox" value="true"/>
-					<fmt:message key="authoring.tbl.use.noticeboard" />&nbsp; 
-					<i class="fa fa-question-circle" aria-hidden="true" data-toggle="tooltip" data-placement="right"
-					   title="<fmt:message key='authoring.tbl.use.noticeboard.tooltip'/>">
-					</i>
-				</label>
-			</div>
-			<div class="form-group" id="divappex${appexNumber}NBEntryDiv">
-				<lams:CKEditor id="divappex${appexNumber}NBEntry" value="" contentFolderID="${contentFolderID}" height="100"></lams:CKEditor>
-			</div>
-		</div>
-		
 		<!-- Question Bank for this Application Excercise -->
-		<div class="panel-group question-bank-div space-sides" id="question-bank-ae-div-${appexNumber}" role="tablist" aria-multiselectable="true"> 
+		<div class="question-bank-div space-sides" id="question-bank-ae-div-${appexNumber}" role="tablist" aria-multiselectable="true"> 
 		    <div class="panel panel-default">
 		        <div class="panel-heading collapsable-icon-left" id="question-bank-ae-heading-${appexNumber}">
 		        	<span class="panel-title">
@@ -127,6 +112,35 @@
 				</div>
 			</div>
 		</div>
+		
+		<div class="space-top space-sides space-bottom">
+			<div class="panel panel-default">
+		        <div class="panel-heading collapsable-icon-left" id="advanced-settings-ae-${appexNumber}-heading">
+		        	<span class="panel-title">
+				    	<a role="button" data-toggle="collapse" href="#advanced-settings-ae-${appexNumber}-collapse" class="collapsed"
+				    	   aria-expanded="false" aria-controls="advanced-settings-ae-${appexNumber}-collapse">
+			          		<fmt:message key="label.tab.advanced" />
+			        	</a>
+		      		</span>
+		        </div>
+		
+				<div id="advanced-settings-ae-${appexNumber}-collapse" class="panel-body panel-collapse collapse" role="tabpanel" 
+					 aria-labelledby="#advanced-settings-ae-${appexNumber}-heading">
+					<div class="checkbox">
+						<label for="divappex${appexNumber}NB">
+							<input name="divappex${appexNumber}NB" id="divappex${appexNumber}NB" type="checkbox" value="true"/>
+							<fmt:message key="authoring.tbl.use.noticeboard" />&nbsp; 
+							<i class="fa fa-question-circle" aria-hidden="true" data-toggle="tooltip" data-placement="right"
+							   title="<fmt:message key='authoring.tbl.use.noticeboard.tooltip'/>">
+							</i>
+						</label>
+					</div>
+					<div class="form-group" id="divappex${appexNumber}NBEntryDiv">
+						<lams:CKEditor id="divappex${appexNumber}NBEntry" value="" contentFolderID="${contentFolderID}" height="100"></lams:CKEditor>
+					</div>
+				</div>
+			</div>
+		</div>
 	</div>
 	
 	<script type="text/javascript">
Index: lams_central/web/authoring/template/tbl/appexDoku.jsp
===================================================================
diff -u -rd8e3d476c866737741923397fc21dce88cd2de9e -r766973f2a21ca668667914744418c4c25dc031e3
--- lams_central/web/authoring/template/tbl/appexDoku.jsp	(.../appexDoku.jsp)	(revision d8e3d476c866737741923397fc21dce88cd2de9e)
+++ lams_central/web/authoring/template/tbl/appexDoku.jsp	(.../appexDoku.jsp)	(revision 766973f2a21ca668667914744418c4c25dc031e3)
@@ -49,47 +49,60 @@
 		    </label>
 		    <lams:CKEditor id="divappex${param.appexNumber}dokuInstructions" value="" contentFolderID="${param.contentFolderID}" height="100" toolbarSet="DefaultDoku" method="inline"/>
 		</div>
-
-		<div class="space-top space-sides space-bottom">
-			<div class="checkbox">
-				<label for="divappex${param.appexNumber}dokuGalleryWalkEnabled">
-					<input name="divappex${param.appexNumber}dokuGalleryWalkEnabled" id="divappex${param.appexNumber}dokuGalleryWalkEnabled" type="checkbox" value="true" />
-					<fmt:message key="authoring.label.application.exercise.doku.gallery.walk.enabled" />&nbsp; 
-					<i class="fa fa-question-circle" aria-hidden="true" data-toggle="tooltip" data-placement="right"
-					   title="<fmt:message key='authoring.label.application.exercise.doku.gallery.walk.enabled.tooltip'/>">
-					</i>
-				</label>
-			</div>
-			
-			<div id="divappex${param.appexNumber}dokuGalleryWalkOptions" class="loffset10">
+		
+		<div class="panel panel-default">
+	        <div class="panel-heading collapsable-icon-left" id="advanced-settings-ae-${param.appexNumber}-heading">
+	        	<span class="panel-title">
+			    	<a role="button" data-toggle="collapse" href="#advanced-settings-ae-${param.appexNumber}-collapse" class="collapsed"
+			    	   aria-expanded="false" aria-controls="advanced-settings-ae-${param.appexNumber}-collapse">
+		          		<fmt:message key="label.tab.advanced" />
+		        	</a>
+	      		</span>
+	        </div>
+	
+			<div id="advanced-settings-ae-${param.appexNumber}-collapse" class="panel-body panel-collapse collapse" role="tabpanel" 
+				 aria-labelledby="#advanced-settings-ae-${param.appexNumber}-heading">
+				 
 				<div class="checkbox">
-					<label for="divappex${param.appexNumber}dokuGalleryWalkReadOnly">
-						<input name="divappex${param.appexNumber}dokuGalleryWalkReadOnly" id="divappex${param.appexNumber}dokuGalleryWalkReadOnly" 
-							   type="checkbox" value="true" />
-						<fmt:message key="authoring.label.application.exercise.doku.gallery.walk.read.only" />
+					<label for="divappex${param.appexNumber}dokuGalleryWalkEnabled">
+						<input name="divappex${param.appexNumber}dokuGalleryWalkEnabled" id="divappex${param.appexNumber}dokuGalleryWalkEnabled" type="checkbox" value="true" />
+						<fmt:message key="authoring.label.application.exercise.doku.gallery.walk.enabled" />&nbsp; 
+						<i class="fa fa-question-circle" aria-hidden="true" data-toggle="tooltip" data-placement="right"
+						   title="<fmt:message key='authoring.label.application.exercise.doku.gallery.walk.enabled.tooltip'/>">
+						</i>
 					</label>
-					<i class="fa fa-question-circle" 
-					   data-toggle="tooltip" title="<fmt:message key='authoring.label.application.exercise.doku.gallery.walk.read.only.tooltip' />"></i>
 				</div>
 				
-				<div class="form-group">
-					<textarea name="divappex${param.appexNumber}dokuGalleryWalkInstructions" class="form-control" rows="3" 
-							  placeholder="<fmt:message key='authoring.label.application.exercise.doku.gallery.walk.instructions'/>"></textarea>
+				<div id="divappex${param.appexNumber}dokuGalleryWalkOptions" class="loffset10">
+					<div class="checkbox">
+						<label for="divappex${param.appexNumber}dokuGalleryWalkReadOnly">
+							<input name="divappex${param.appexNumber}dokuGalleryWalkReadOnly" id="divappex${param.appexNumber}dokuGalleryWalkReadOnly" 
+								   type="checkbox" value="true" />
+							<fmt:message key="authoring.label.application.exercise.doku.gallery.walk.read.only" />
+						</label>
+						<i class="fa fa-question-circle" 
+						   data-toggle="tooltip" title="<fmt:message key='authoring.label.application.exercise.doku.gallery.walk.read.only.tooltip' />"></i>
+					</div>
+					
+					<div class="form-group">
+						<textarea name="divappex${param.appexNumber}dokuGalleryWalkInstructions" class="form-control" rows="3" 
+								  placeholder="<fmt:message key='authoring.label.application.exercise.doku.gallery.walk.instructions'/>"></textarea>
+					</div>
 				</div>
+				
+				<div class="checkbox">
+					<label for="divappex${param.appexNumber}NB">
+						<input name="divappex${param.appexNumber}NB" id="divappex${param.appexNumber}NB" type="checkbox" value="true"/>
+						<fmt:message key="authoring.tbl.use.noticeboard" />&nbsp; 
+						<i class="fa fa-question-circle" aria-hidden="true" data-toggle="tooltip" data-placement="right"
+						   title="<fmt:message key='authoring.tbl.use.noticeboard.tooltip'/>">
+						</i>
+					</label>
+				</div>
+				<div class="form-group" id="divappex${param.appexNumber}NBEntryDiv">
+					<lams:CKEditor id="divappex${param.appexNumber}NBEntry" value="" contentFolderID="${param.contentFolderID}" height="100"></lams:CKEditor>
+				</div>
 			</div>
-			
-			<div class="checkbox">
-				<label for="divappex${param.appexNumber}NB">
-					<input name="divappex${param.appexNumber}NB" id="divappex${param.appexNumber}NB" type="checkbox" value="true"/>
-					<fmt:message key="authoring.tbl.use.noticeboard" />&nbsp; 
-					<i class="fa fa-question-circle" aria-hidden="true" data-toggle="tooltip" data-placement="right"
-					   title="<fmt:message key='authoring.tbl.use.noticeboard.tooltip'/>">
-					</i>
-				</label>
-			</div>
-			<div class="form-group" id="divappex${param.appexNumber}NBEntryDiv">
-				<lams:CKEditor id="divappex${param.appexNumber}NBEntry" value="" contentFolderID="${param.contentFolderID}" height="100"></lams:CKEditor>
-			</div>
 		</div>
 	</div>
 	
Index: lams_central/web/authoring/template/tbl/tbl.jsp
===================================================================
diff -u -r4e5f216c4e5f78254e8e7ebeacd4725b3fbc0161 -r766973f2a21ca668667914744418c4c25dc031e3
--- lams_central/web/authoring/template/tbl/tbl.jsp	(.../tbl.jsp)	(revision 4e5f216c4e5f78254e8e7ebeacd4725b3fbc0161)
+++ lams_central/web/authoring/template/tbl/tbl.jsp	(.../tbl.jsp)	(revision 766973f2a21ca668667914744418c4c25dc031e3)
@@ -254,47 +254,37 @@
 		<div class="tab-pane" id="tab3">
 			<span class="field-name"><fmt:message key="authoring.tbl.desc.question"/></span>
 
-			<div class="form-group voffset10">
-					<input title="123" type="checkbox" name="confidenceLevelEnable" value="true" class="form-control-inline" id="confidenceLevelEnable" checked/>&nbsp;
-				<label for="confidenceLevelEnable">
-					<fmt:message key="authoring.enable.confidence.levels"/>
-				</label>
-                <i class="fa fa-question-circle" aria-hidden="true" data-toggle="tooltip" data-placement="right" title="<fmt:message key='authoring.tbl.enable.confidence.tooltip'/>"></i>
-			</div>
-			
 		 	<input type="hidden" name="numQuestions" id="numQuestions" value="0"/>
 			
 			<div id="divquestions">
 			</div>
 		
-			<span class="voffset10">
-				<div class="btn-group">
-					<button id="createQuestionButton"
-							onClick="javascript:createQuestion('numQuestions', 'divq', 'divquestions', '', '')" 
-							type="button" class="btn btn-default">
-								<i class="fa fa-plus text-primary"></i> <fmt:message key="authoring.create.question"/>
-					</button>
-					<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-						<span class="caret"></span><span class="sr-only">Toggle Dropdown</span>
-					</button>
-					<ul class="dropdown-menu dropdown-menu-right">
-						<li><a href="javascript:void(0)" onClick="javascript:openQuestionBank()"> 
-							<i class="fa fa-bank text-primary" ></i> <fmt:message key="authoring.create.question.qb"/>
-							</a>
-						</li>
-                        <li role="separator" class="divider"></li>
-						<li class="dropdown-header"><fmt:message key="authoring.tbl.import.questions.from"/></li>
-						<li><a style="margin-left: 1em;" href="javascript:void(0)" id="importWordButton" onClick="javascript:importQTI('mcq', 'mc,mh', 'word')">
-								<i class="fa fa-file-word-o text-primary"></i> <fmt:message key="label.qb.collection.word"/>...
-                            </a>
-                        </li>	
-						<li><a style="margin-left: 1em;" href="javascript:void(0)" onClick="javascript:importQTI('mcq', 'mc,mh', 'qti')" id="importQTIButton">
-								<i class="fa fa-file-code-o text-primary"></i> <fmt:message key="label.qb.collection.qti"/>...
-                            </a>
-                        </li>
-					</ul>
-				</div>
-			</span>
+			<div class="btn-group voffset10">
+				<button id="createQuestionButton"
+						onClick="javascript:createQuestion('numQuestions', 'divq', 'divquestions', '', '')" 
+						type="button" class="btn btn-default">
+							<i class="fa fa-plus text-primary"></i> <fmt:message key="authoring.create.question"/>
+				</button>
+				<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+					<span class="caret"></span><span class="sr-only">Toggle Dropdown</span>
+				</button>
+				<ul class="dropdown-menu dropdown-menu-right">
+					<li><a href="javascript:void(0)" onClick="javascript:openQuestionBank()"> 
+						<i class="fa fa-bank text-primary" ></i> <fmt:message key="authoring.create.question.qb"/>
+						</a>
+					</li>
+                       <li role="separator" class="divider"></li>
+					<li class="dropdown-header"><fmt:message key="authoring.tbl.import.questions.from"/></li>
+					<li><a style="margin-left: 1em;" href="javascript:void(0)" id="importWordButton" onClick="javascript:importQTI('mcq', 'mc,mh', 'word')">
+							<i class="fa fa-file-word-o text-primary"></i> <fmt:message key="label.qb.collection.word"/>...
+                           </a>
+                       </li>	
+					<li><a style="margin-left: 1em;" href="javascript:void(0)" onClick="javascript:importQTI('mcq', 'mc,mh', 'qti')" id="importQTIButton">
+							<i class="fa fa-file-code-o text-primary"></i> <fmt:message key="label.qb.collection.qti"/>...
+                           </a>
+                       </li>
+				</ul>
+			</div>
 			
 			<!-- Question Bank -->
 			<div class="panel-group question-bank-div" id="question-bank-ira-div" role="tablist" aria-multiselectable="true"> 
@@ -312,6 +302,28 @@
 					</div>
 				</div>
 			</div>
+			
+			<div class="panel panel-default voffset20">
+		        <div class="panel-heading collapsable-icon-left" id="advanced-settings-ira-heading">
+		        	<span class="panel-title">
+				    	<a role="button" data-toggle="collapse" href="#advanced-settings-ira-collapse" class="collapsed"
+				    	   aria-expanded="false" aria-controls="advanced-settings-ira-collapse">
+			          		<fmt:message key="label.tab.advanced" />
+			        	</a>
+		      		</span>
+		        </div>
+		
+				<div id="advanced-settings-ira-collapse" class="panel-body panel-collapse collapse" role="tabpanel" aria-labelledby="#advanced-settings-ira-heading">
+					<div class="form-group voffset10">
+						<input type="checkbox" name="confidenceLevelEnable" value="true" class="form-control-inline" id="confidenceLevelEnable" checked/>&nbsp;
+						<label for="confidenceLevelEnable">
+							<fmt:message key="authoring.enable.confidence.levels"/>
+						</label>
+		                <i class="fa fa-question-circle" aria-hidden="true" data-toggle="tooltip" data-placement="right" title="<fmt:message key='authoring.tbl.enable.confidence.tooltip'/>"></i>
+					</div>	
+				</div>
+			</div>
+			
 			<!-- Hidden div just for storing ID of the imported QB question -->
 			<div id="itemArea"></div>
 			
@@ -329,7 +341,6 @@
 			<a href="#" onclick="javascript:createApplicationExercise('assessment')" class="btn btn-default">
 				<i class="fa fa-plus"></i> <fmt:message key="authoring.create.application.exercise"/>
 			</a>
-			
 	    </div>
 
 		<c:if test="${usePreview}">