Index: lams_tool_assessment/web/WEB-INF/tags/Dropdown.tag
===================================================================
diff -u
--- lams_tool_assessment/web/WEB-INF/tags/Dropdown.tag	(revision 0)
+++ lams_tool_assessment/web/WEB-INF/tags/Dropdown.tag	(revision 4db761ac22cb30c958b4a1fc5e9cb6c1a9f42ff7)
@@ -0,0 +1,41 @@
+<% 
+ /**
+  * Dropdown.tag
+  *	Author: Marcin Cieslak
+  *	Description: Displays a row with a label and a styled select widget
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+
+<%@ attribute name="name" required="true" rtexprvalue="true" %>
+<%@ attribute name="labelKey" required="true" rtexprvalue="true" %>
+
+<%@ attribute name="id" required="false" rtexprvalue="true" %>
+<%@ attribute name="tooltipKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="tooltipDescriptionKey" required="false" rtexprvalue="true" %>
+
+<c:set var="id" value="${empty id ? name : id}" />
+
+<div class="form-group row">
+	<label class="col-sm-8 col-form-label" for="${id}">
+		<fmt:message key="${labelKey}" />
+		
+		<c:if test="${not empty tooltipKey}">
+			<a tabindex="0" role="button" data-toggle="tooltip" title="<fmt:message key='${tooltipKey}' />">
+				<i class="info_icon fa fa-info-circle text-info fa-fw"
+					<c:if test="${not empty tooltipDescriptionKey}">
+						aria-label="<fmt:message key="${tooltipDescriptionKey}" />"
+					</c:if>
+				></i>
+			</a>
+		</c:if>
+	</label>
+	
+    <div class="col-sm-4 justify-content-end d-flex">
+        <select name="${name}" id="${id}" class="form-control form-control-select" aria-label="<fmt:message key='${tooltipKey}' />">
+            <jsp:doBody />
+        </select>
+    </div>
+</div>
\ No newline at end of file
Index: lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r1cb9d25feee29b24d2e09b9f4886b2ab00dcc5e1 -r4db761ac22cb30c958b4a1fc5e9cb6c1a9f42ff7
--- lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 1cb9d25feee29b24d2e09b9f4886b2ab00dcc5e1)
+++ lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 4db761ac22cb30c958b4a1fc5e9cb6c1a9f42ff7)
@@ -421,4 +421,8 @@
 	    <name>Switch</name>
 		<path>/WEB-INF/tags/Switch.tag</path>
    	</tag-file>  
+   	<tag-file>
+	    <name>Dropdown</name>
+		<path>/WEB-INF/tags/Dropdown.tag</path>
+   	</tag-file> 
 </taglib>
Index: lams_tool_assessment/web/pages/authoring/authoring5.jsp
===================================================================
diff -u -r1cb9d25feee29b24d2e09b9f4886b2ab00dcc5e1 -r4db761ac22cb30c958b4a1fc5e9cb6c1a9f42ff7
--- lams_tool_assessment/web/pages/authoring/authoring5.jsp	(.../authoring5.jsp)	(revision 1cb9d25feee29b24d2e09b9f4886b2ab00dcc5e1)
+++ lams_tool_assessment/web/pages/authoring/authoring5.jsp	(.../authoring5.jsp)	(revision 4db761ac22cb30c958b4a1fc5e9cb6c1a9f42ff7)
@@ -173,54 +173,53 @@
 				
 				<lams:Panel id="advanced" titleKey="label.authoring.heading.advance" iconClass="fa-gear" colorClass="purple" expanded="false">
                    	<div class="col-12 col-xl-6 pr-5">
-                        <div class="form-group row">
-                             <label class="col-sm-8 col-form-label" for="questionsPerPage">Questions per page <a  tabindex="0" role="button" data-toggle="tooltip" title="Vivamus sagittis lacus vel augue laoreet rutrum faucibus."><i class="info_icon fa fa-info-circle text-info fa-fw" aria-label="Help with Questions per page"></i></a></label>
-                              <div class="col-sm-4 justify-content-end d-flex">
-                                 <select class="form-control form-control-select" id="questionsPerPage" aria-label="Options for gate" tabindex="0">
-                                     <option>All</option>
-                                     <option>All</option>
-                                     <option>All</option>
-                                 </select>
-                             </div>     
-                        </div>  
+                   		<lams:Dropdown name="questions-per-page" 
+                   					   labelKey="label.authoring.advance.questions.per.page"
+							 		   tooltipKey="label.authoring.advance.questions.per.page.tooltip"
+							 		   tooltipDescriptionKey="label.authoring.advance.questions.per.page.tooltip.description"
+						>
+                           <option>All</option>
+                           <option>All</option>
+                           <option>All</option>
+                        </lams:Dropdown>
                                     
                         <lams:Switch name="question-numbering" checked="true" 
 							 labelKey="label.authoring.advance.numbered.questions"
 							 tooltipKey="label.authoring.advance.numbered.questions.tooltip"
 							 tooltipDescriptionKey="label.authoring.advance.numbered.questions.tooltip.description"
 						/>
-								
-						<div class="form-group row">
-							<label class="col-sm-8 col-form-label" for="option11">Time limit (minutes) <a tabindex="0" role="button" data-toggle="tooltip" title="Vivamus sagittis lacus vel augue laoreet rutrum faucibus."><i class="info_icon fa fa-info-circle text-info fa-fw" aria-label="Help with Questions per page"></i></a></label>
-                                        <div class="col-sm-4 justify-content-end d-flex">
-                                            <select id="option11" class="form-control form-control-select" aria-label="">
-                                                <option>All</option>
-                                                <option>All</option>
-                                                <option>All</option>
-                                            </select>
-                                        </div>
-						</div>
-						<div class="form-group row">
-							<label class="col-sm-8 col-form-label" for="">Attempts allowed <a tabindex="0" role="button" data-toggle="tooltip" title="Vivamus sagittis lacus vel augue laoreet rutrum faucibus."><i class="info_icon fa fa-info-circle text-info fa-fw" aria-label="Help with Questions per page"></i></a></label>
-                                        <div class="col-sm-4 justify-content-end d-flex">
-                                            <select class="form-control form-control-select" aria-label="">
-                                                <option>1</option>
-                                                <option>1</option>
-                                                <option>1</option>
-                                            </select>
-                                        </div>
-						</div>
-						<div class="form-group row">
-							<label class="col-sm-8 col-form-label" for="">Assessment passing mark <span class="info_icon" data-toggle="tooltip" title="Vivamus sagittis lacus vel augue laoreet rutrum faucibus.">i</span></label>
-                                        <div class="col-sm-4 justify-content-end d-flex">
-                                            <select class="form-control form-control-select" aria-label="">
-                                                <option>None</option>
-                                                <option>None</option>
-                                                <option>None</option>
-                                            </select>
-                                        </div>
-						</div>
+						
+						<lams:Dropdown name="time-limit" 
+                   					   labelKey="label.authoring.advance.time.limit"
+							 		   tooltipKey="label.authoring.advance.time.limit.tooltip"
+							 		   tooltipDescriptionKey="label.authoring.advance.time.limit.tooltip.description"
+						>
+                           <option>All</option>
+                           <option>All</option>
+                           <option>All</option>
+                        </lams:Dropdown>
+                        		
+						<lams:Dropdown name="attempts-allowed" 
+                   					   labelKey="label.authoring.advance.attempts.allowed"
+							 		   tooltipKey="label.authoring.advance.attempts.allowed.tooltip"
+							 		   tooltipDescriptionKey="label.authoring.advance.attempts.allowed.tooltip.description"
+						>
+                           <option>1</option>
+                           <option>1</option>
+                           <option>1</option>
+                        </lams:Dropdown>
+                        
+						<lams:Dropdown name="passing-mark" 
+                   					   labelKey="label.authoring.advance.passing.mark"
+							 		   tooltipKey="label.authoring.advance.passing.mark.tooltip"
+							 		   tooltipDescriptionKey="label.authoring.advance.passing.mark.tooltip.description"
+						>
+                            <option>None</option>
+                            <option>None</option>
+                            <option>None</option>
+                        </lams:Dropdown>
 					</div>
+					
 					<div class="col-12 col-xl-6 pr-4">
 						<lams:Switch name="shuffle-questions" checked="true" 
 									 labelKey="label.authoring.basic.shuffle.the.choices"
@@ -261,444 +260,355 @@
 				</lams:Panel>
 				
 				<lams:Panel id="leaderselection" titleKey="label.select.leader" iconClass="fa-star-o" colorClass="yellow" expanded="false">
+					<div class="col-12 col-xl-6 pr-5">
+                   		<lams:Dropdown name="questions-per-page" 
+                   					   labelKey="label.authoring.advance.questions.per.page"
+							 		   tooltipKey="label.authoring.advance.questions.per.page.tooltip"
+							 		   tooltipDescriptionKey="label.authoring.advance.questions.per.page.tooltip.description"
+						>
+                           <option>All</option>
+                           <option>All</option>
+                           <option>All</option>
+                        </lams:Dropdown>
+                                    
+                        <lams:Switch name="question-numbering" checked="true" 
+							 labelKey="label.authoring.advance.numbered.questions"
+							 tooltipKey="label.authoring.advance.numbered.questions.tooltip"
+							 tooltipDescriptionKey="label.authoring.advance.numbered.questions.tooltip.description"
+						/>
+						
+						<lams:Dropdown name="time-limit" 
+                   					   labelKey="label.authoring.advance.time.limit"
+							 		   tooltipKey="label.authoring.advance.time.limit.tooltip"
+							 		   tooltipDescriptionKey="label.authoring.advance.time.limit.tooltip.description"
+						>
+                           <option>All</option>
+                           <option>All</option>
+                           <option>All</option>
+                        </lams:Dropdown>
+                        		
+						<lams:Dropdown name="attempts-allowed" 
+                   					   labelKey="label.authoring.advance.attempts.allowed"
+							 		   tooltipKey="label.authoring.advance.attempts.allowed.tooltip"
+							 		   tooltipDescriptionKey="label.authoring.advance.attempts.allowed.tooltip.description"
+						>
+                           <option>1</option>
+                           <option>1</option>
+                           <option>1</option>
+                        </lams:Dropdown>
+                        
+						<lams:Dropdown name="passing-mark" 
+                   					   labelKey="label.authoring.advance.passing.mark"
+							 		   tooltipKey="label.authoring.advance.passing.mark.tooltip"
+							 		   tooltipDescriptionKey="label.authoring.advance.passing.mark.tooltip.description"
+						>
+                            <option>None</option>
+                            <option>None</option>
+                            <option>None</option>
+                        </lams:Dropdown>
+					</div>
+					
 					<div class="col-12 col-xl-6 pr-4">
-                           <div class="form-group row">
-                               <label class="col-sm-8 col-form-label" for="questionsPerPage">Questions per page <a  tabindex="0" role="button" data-toggle="tooltip" title="Vivamus sagittis lacus vel augue laoreet rutrum faucibus."><i class="info_icon fa fa-info-circle text-info fa-fw" aria-label="Help with Questions per page"></i></a></label>
-                                <div class="col-sm-4 justify-content-end d-flex">
-                                   <select class="form-control form-control-select" id="questionsPerPage" aria-label="Options for gate" tabindex="0">
-                                       <option>All</option>
-                                       <option>All</option>
-                                       <option>All</option>
-                                   </select>
-                               </div>     
-                           </div>    
-						<div class="form-group row">
-							<label class="col-sm-8 col-form-label" for="shuffleQuestions">Shuffle questions  <a tabindex="0" role="button" data-toggle="tooltip" title="Vivamus sagittis lacus vel augue laoreet rutrum faucibus."><i class="info_icon fa fa-info-circle text-info fa-fw" aria-label="Help with Questions per page"></i></a></label>
-                                        <div class="col-sm-4 justify-content-end d-flex">
-                                            <label class="switch" >
-                                              <input type="checkbox" id="shuffleQuestions" checked="">
-                                              <span class="slider round"></span>
-                                            </label>
-                                        </div>    
-						</div>
-						<div class="form-group row">
-							<label class="col-sm-8 col-form-label" for="">Enable question numbering <a tabindex="0" role="button" data-toggle="tooltip" title="Vivamus sagittis lacus vel augue laoreet rutrum faucibus."><i class="info_icon fa fa-info-circle text-info fa-fw" aria-label="Help with Questions per page"></i></a></label>
-                                        <div class="col-sm-4 justify-content-end d-flex">
-                                            <label class="switch">
-                                              <input type="checkbox" checked="">
-                                              <span class="slider round"></span>
-                                            </label>
-                                        </div>
-						</div>
-						<div class="form-group row">
-							<label class="col-sm-8 col-form-label" for="option11">Time limit (minutes) <a tabindex="0" role="button" data-toggle="tooltip" title="Vivamus sagittis lacus vel augue laoreet rutrum faucibus."><i class="info_icon fa fa-info-circle text-info fa-fw" aria-label="Help with Questions per page"></i></a></label>
-                                        <div class="col-sm-4 justify-content-end d-flex">
-                                            <select id="option11" class="form-control form-control-select" aria-label="">
-                                                <option>All</option>
-                                                <option>All</option>
-                                                <option>All</option>
-                                            </select>
-                                        </div>
-						</div>
-						<div class="form-group row">
-							<label class="col-sm-8 col-form-label" for="">Attempts allowed <a tabindex="0" role="button" data-toggle="tooltip" title="Vivamus sagittis lacus vel augue laoreet rutrum faucibus."><i class="info_icon fa fa-info-circle text-info fa-fw" aria-label="Help with Questions per page"></i></a></label>
-                                        <div class="col-sm-4 justify-content-end d-flex">
-                                            <select class="form-control form-control-select" aria-label="">
-                                                <option>1</option>
-                                                <option>1</option>
-                                                <option>1</option>
-                                            </select>
-                                        </div>
-						</div>
-						<div class="form-group row">
-							<label class="col-sm-8 col-form-label" for="">Assessment passing mark <span class="info_icon" data-toggle="tooltip" title="Vivamus sagittis lacus vel augue laoreet rutrum faucibus.">i</span></label>
-                                        <div class="col-sm-4 justify-content-end d-flex">
-                                            <select class="form-control form-control-select" aria-label="">
-                                                <option>None</option>
-                                                <option>None</option>
-                                                <option>None</option>
-                                            </select>
-                                        </div>
-						</div>
+						<lams:Switch name="shuffle-questions" checked="true" 
+									 labelKey="label.authoring.basic.shuffle.the.choices"
+									 tooltipKey="label.authoring.basic.shuffle.the.choices.tooltip"
+									 tooltipDescriptionKey="label.authoring.basic.shuffle.the.choices.tooltip.description"
+						/>
+						
+						<lams:Switch name="display-all"
+									 labelKey="label.authoring.advance.display.summary"
+									 tooltipKey="label.authoring.advance.display.summary.tooltip"
+									 tooltipDescriptionKey="label.authoring.advance.display.summary.tooltip.description"
+						/>
+						
+                       <lams:Switch name="display-over-all" checked="true" 
+									labelKey="label.authoring.advance.allow.students.overall.feedback"
+									tooltipKey="label.authoring.advance.allow.students.overall.feedback.tooltip"
+									tooltipDescriptionKey="label.authoring.advance.allow.students.overall.feedback.tooltip.description"
+						/>
+						
+						<lams:Switch name="allow-learners"
+									 labelKey="label.authoring.advance.allow.students.grades"
+									 tooltipKey="label.authoring.advance.allow.students.grades.tooltip"
+									 tooltipDescriptionKey="label.authoring.advance.allow.students.grades.tooltip.description"
+						/>
+						
+						<lams:Switch name="enable-justification" checked="true" 
+									labelKey="label.authoring.advance.answer.justification"
+									tooltipKey="label.authoring.advance.answer.justification.tooltip"
+									tooltipDescriptionKey="label.authoring.advance.answer.justification.tooltip.description"
+						/>
+						
+						<lams:Switch name="enable-confidence"
+									 labelKey="label.enable.confidence.levels"
+									 tooltipKey="label.enable.confidence.levels.tooltip"
+									 tooltipDescriptionKey="label.enable.confidence.levels.tooltip.description"
+						/>
 					</div>
-					<div class="col-12 col-xl-6 pr-2">
-						<div class="form-group row">
-							<label class="col-sm-10 col-form-label" for="">Display all questions & answers once the learner finishes <a tabindex="0" role="button" data-toggle="tooltip" title="Vivamus sagittis lacus vel augue laoreet rutrum faucibus."><i class="info_icon fa fa-info-circle text-info fa-fw" aria-label="Help with Questions per page"></i></a></label>
-                                        <div class="col-sm-2 justify-content-end d-flex">
-                                            <label class="switch">
-                                              <input type="checkbox" checked="">
-                                              <span class="slider round"></span>
-                                            </label>
-                                         </div>    
-						</div>
-						<div class="form-group row">
-							<label class="col-sm-10 col-form-label" for="">Display overall feedback at the end of each attempt</label>
-							<div class="col-sm-2 justify-content-end d-flex">
-                                            <label class="switch">
-							     <input type="checkbox">
-							     <span class="slider round"></span>        
-							     </label>
-                                        </div>    
-						</div>
-						<div class="form-group row">
-							<label class="col-sm-9 col-form-label" for="">Allow learners to see grades at the end of each attempt <a tabindex="0" role="button" data-toggle="tooltip" title="Vivamus sagittis lacus vel augue laoreet rutrum faucibus."><i class="info_icon fa fa-info-circle text-info fa-fw" aria-label="Help with Questions per page"></i></a></label>
-                                        <div class="col-sm-3 justify-content-end d-flex">
-                                            <label class="switch">
-                                              <input type="checkbox" checked="">
-                                              <span class="slider round"></span>
-                                            </label>
-                                        </div>    
-						</div>
-						<div class="form-group row">
-							<label class="col-sm-9 col-form-label" for="">Enable answer justification <a tabindex="0" role="button" data-toggle="tooltip" title="Vivamus sagittis lacus vel augue laoreet rutrum faucibus."><i class="info_icon fa fa-info-circle text-info fa-fw" aria-label="Help with Questions per page"></i></a></label>
-                                        <div class="col-sm-3 justify-content-end d-flex">
-                                            <label class="switch">
-                                              <input type="checkbox">
-                                              <span class="slider round"></span>
-                                            </label>
-                                        </div>    
-						</div>
-						<div class="form-group row">
-							<label class="col-sm-9 col-form-label" for="">Enable confidence level <a tabindex="0" role="button" data-toggle="tooltip" title="Vivamus sagittis lacus vel augue laoreet rutrum faucibus."><i class="info_icon fa fa-info-circle text-info fa-fw" aria-label="Help with Questions per page"></i></a></label>
-                                        <div class="col-sm-3 justify-content-end d-flex">
-                                            <label class="switch">
-                                              <input type="checkbox">
-                                              <span class="slider round"></span>
-                                            </label>
-                                        </div>    
-						</div>
-					</div>
 				</lams:Panel>
 				
 				<lams:Panel id="notifications" titleKey="label.notifications" iconClass="fa-bell-o" colorClass="purple" expanded="false">
+					<div class="col-12 col-xl-6 pr-5">
+                   		<lams:Dropdown name="questions-per-page" 
+                   					   labelKey="label.authoring.advance.questions.per.page"
+							 		   tooltipKey="label.authoring.advance.questions.per.page.tooltip"
+							 		   tooltipDescriptionKey="label.authoring.advance.questions.per.page.tooltip.description"
+						>
+                           <option>All</option>
+                           <option>All</option>
+                           <option>All</option>
+                        </lams:Dropdown>
+                                    
+                        <lams:Switch name="question-numbering" checked="true" 
+							 labelKey="label.authoring.advance.numbered.questions"
+							 tooltipKey="label.authoring.advance.numbered.questions.tooltip"
+							 tooltipDescriptionKey="label.authoring.advance.numbered.questions.tooltip.description"
+						/>
+						
+						<lams:Dropdown name="time-limit" 
+                   					   labelKey="label.authoring.advance.time.limit"
+							 		   tooltipKey="label.authoring.advance.time.limit.tooltip"
+							 		   tooltipDescriptionKey="label.authoring.advance.time.limit.tooltip.description"
+						>
+                           <option>All</option>
+                           <option>All</option>
+                           <option>All</option>
+                        </lams:Dropdown>
+                        		
+						<lams:Dropdown name="attempts-allowed" 
+                   					   labelKey="label.authoring.advance.attempts.allowed"
+							 		   tooltipKey="label.authoring.advance.attempts.allowed.tooltip"
+							 		   tooltipDescriptionKey="label.authoring.advance.attempts.allowed.tooltip.description"
+						>
+                           <option>1</option>
+                           <option>1</option>
+                           <option>1</option>
+                        </lams:Dropdown>
+                        
+						<lams:Dropdown name="passing-mark" 
+                   					   labelKey="label.authoring.advance.passing.mark"
+							 		   tooltipKey="label.authoring.advance.passing.mark.tooltip"
+							 		   tooltipDescriptionKey="label.authoring.advance.passing.mark.tooltip.description"
+						>
+                            <option>None</option>
+                            <option>None</option>
+                            <option>None</option>
+                        </lams:Dropdown>
+					</div>
+					
 					<div class="col-12 col-xl-6 pr-4">
-                          	<div class="form-group row">
-                                   <label class="col-sm-8 col-form-label" for="questionsPerPage">Questions per page <a  tabindex="0" role="button" data-toggle="tooltip" title="Vivamus sagittis lacus vel augue laoreet rutrum faucibus."><i class="info_icon fa fa-info-circle text-info fa-fw" aria-label="Help with Questions per page"></i></a></label>
-                                    <div class="col-sm-4 justify-content-end d-flex">
-                                       <select class="form-control form-control-select" id="questionsPerPage" aria-label="Options for gate" tabindex="0">
-                                           <option>All</option>
-                                           <option>All</option>
-                                           <option>All</option>
-                                       </select>
-                                   </div>     
-                               </div>    
-						<div class="form-group row">
-							<label class="col-sm-8 col-form-label" for="shuffleQuestions">Shuffle questions  <a tabindex="0" role="button" data-toggle="tooltip" title="Vivamus sagittis lacus vel augue laoreet rutrum faucibus."><i class="info_icon fa fa-info-circle text-info fa-fw" aria-label="Help with Questions per page"></i></a></label>
-                                  <div class="col-sm-4 justify-content-end d-flex">
-                                      <label class="switch" >
-                                        <input type="checkbox" id="shuffleQuestions" checked="">
-                                        <span class="slider round"></span>
-                                      </label>
-                                  </div>    
-						</div>
-						<div class="form-group row">
-							<label class="col-sm-8 col-form-label" for="">Enable question numbering <a tabindex="0" role="button" data-toggle="tooltip" title="Vivamus sagittis lacus vel augue laoreet rutrum faucibus."><i class="info_icon fa fa-info-circle text-info fa-fw" aria-label="Help with Questions per page"></i></a></label>
-                                  <div class="col-sm-4 justify-content-end d-flex">
-                                      <label class="switch">
-                                        <input type="checkbox" checked="">
-                                        <span class="slider round"></span>
-                                      </label>
-                                  </div>
-						</div>
-						<div class="form-group row">
-							<label class="col-sm-8 col-form-label" for="option11">Time limit (minutes) <a tabindex="0" role="button" data-toggle="tooltip" title="Vivamus sagittis lacus vel augue laoreet rutrum faucibus."><i class="info_icon fa fa-info-circle text-info fa-fw" aria-label="Help with Questions per page"></i></a></label>
-                                   <div class="col-sm-4 justify-content-end d-flex">
-                                       <select id="option11" class="form-control form-control-select" aria-label="">
-                                           <option>All</option>
-                                           <option>All</option>
-                                           <option>All</option>
-                                       </select>
-                                   </div>
-						</div>
-						<div class="form-group row">
-							<label class="col-sm-8 col-form-label" for="">Attempts allowed <a tabindex="0" role="button" data-toggle="tooltip" title="Vivamus sagittis lacus vel augue laoreet rutrum faucibus."><i class="info_icon fa fa-info-circle text-info fa-fw" aria-label="Help with Questions per page"></i></a></label>
-                                        <div class="col-sm-4 justify-content-end d-flex">
-                                            <select class="form-control form-control-select" aria-label="">
-                                                <option>1</option>
-                                                <option>1</option>
-                                                <option>1</option>
-                                            </select>
-                                        </div>
-						</div>
-						<div class="form-group row">
-							<label class="col-sm-8 col-form-label" for="">Assessment passing mark <span class="info_icon" data-toggle="tooltip" title="Vivamus sagittis lacus vel augue laoreet rutrum faucibus.">i</span></label>
-                                        <div class="col-sm-4 justify-content-end d-flex">
-                                            <select class="form-control form-control-select" aria-label="">
-                                                <option>None</option>
-                                                <option>None</option>
-                                                <option>None</option>
-                                            </select>
-                                        </div>
-						</div>
+						<lams:Switch name="shuffle-questions" checked="true" 
+									 labelKey="label.authoring.basic.shuffle.the.choices"
+									 tooltipKey="label.authoring.basic.shuffle.the.choices.tooltip"
+									 tooltipDescriptionKey="label.authoring.basic.shuffle.the.choices.tooltip.description"
+						/>
+						
+						<lams:Switch name="display-all"
+									 labelKey="label.authoring.advance.display.summary"
+									 tooltipKey="label.authoring.advance.display.summary.tooltip"
+									 tooltipDescriptionKey="label.authoring.advance.display.summary.tooltip.description"
+						/>
+						
+                       <lams:Switch name="display-over-all" checked="true" 
+									labelKey="label.authoring.advance.allow.students.overall.feedback"
+									tooltipKey="label.authoring.advance.allow.students.overall.feedback.tooltip"
+									tooltipDescriptionKey="label.authoring.advance.allow.students.overall.feedback.tooltip.description"
+						/>
+						
+						<lams:Switch name="allow-learners"
+									 labelKey="label.authoring.advance.allow.students.grades"
+									 tooltipKey="label.authoring.advance.allow.students.grades.tooltip"
+									 tooltipDescriptionKey="label.authoring.advance.allow.students.grades.tooltip.description"
+						/>
+						
+						<lams:Switch name="enable-justification" checked="true" 
+									labelKey="label.authoring.advance.answer.justification"
+									tooltipKey="label.authoring.advance.answer.justification.tooltip"
+									tooltipDescriptionKey="label.authoring.advance.answer.justification.tooltip.description"
+						/>
+						
+						<lams:Switch name="enable-confidence"
+									 labelKey="label.enable.confidence.levels"
+									 tooltipKey="label.enable.confidence.levels.tooltip"
+									 tooltipDescriptionKey="label.enable.confidence.levels.tooltip.description"
+						/>
 					</div>
-					<div class="col-12 col-xl-6 pr-2">
-							<div class="form-group row">
-							<label class="col-sm-10 col-form-label" for="">Display all questions & answers once the learner finishes <a tabindex="0" role="button" data-toggle="tooltip" title="Vivamus sagittis lacus vel augue laoreet rutrum faucibus."><i class="info_icon fa fa-info-circle text-info fa-fw" aria-label="Help with Questions per page"></i></a></label>
-                                        <div class="col-sm-2 justify-content-end d-flex">
-                                            <label class="switch">
-                                              <input type="checkbox" checked="">
-                                              <span class="slider round"></span>
-                                            </label>
-                                         </div>    
-						</div>
-						<div class="form-group row">
-							<label class="col-sm-10 col-form-label" for="">Display overall feedback at the end of each attempt</label>
-							<div class="col-sm-2 justify-content-end d-flex">
-                                            <label class="switch">
-							     <input type="checkbox">
-							     <span class="slider round"></span>        
-							     </label>
-                                        </div>    
-						</div>
-						<div class="form-group row">
-							<label class="col-sm-9 col-form-label" for="">Allow learners to see grades at the end of each attempt <a tabindex="0" role="button" data-toggle="tooltip" title="Vivamus sagittis lacus vel augue laoreet rutrum faucibus."><i class="info_icon fa fa-info-circle text-info fa-fw" aria-label="Help with Questions per page"></i></a></label>
-                                        <div class="col-sm-3 justify-content-end d-flex">
-                                            <label class="switch">
-                                              <input type="checkbox" checked="">
-                                              <span class="slider round"></span>
-                                            </label>
-                                        </div>    
-						</div>
-						<div class="form-group row">
-							<label class="col-sm-9 col-form-label" for="">Enable answer justification <a tabindex="0" role="button" data-toggle="tooltip" title="Vivamus sagittis lacus vel augue laoreet rutrum faucibus."><i class="info_icon fa fa-info-circle text-info fa-fw" aria-label="Help with Questions per page"></i></a></label>
-                                        <div class="col-sm-3 justify-content-end d-flex">
-                                            <label class="switch">
-                                              <input type="checkbox">
-                                              <span class="slider round"></span>
-                                            </label>
-                                        </div>    
-						</div>
-						<div class="form-group row">
-							<label class="col-sm-9 col-form-label" for="">Enable confidence level <a tabindex="0" role="button" data-toggle="tooltip" title="Vivamus sagittis lacus vel augue laoreet rutrum faucibus."><i class="info_icon fa fa-info-circle text-info fa-fw" aria-label="Help with Questions per page"></i></a></label>
-                                        <div class="col-sm-3 justify-content-end d-flex">
-                                            <label class="switch">
-                                              <input type="checkbox">
-                                              <span class="slider round"></span>
-                                            </label>
-                                        </div>    
-						</div>
-					</div>
 				</lams:Panel>
 				
 				<lams:Panel id="feedback" titleKey="label.authoring.basic.general.feedback" iconClass="fa-comment-o" colorClass="blue" expanded="false">
+					<div class="col-12 col-xl-6 pr-5">
+                   		<lams:Dropdown name="questions-per-page" 
+                   					   labelKey="label.authoring.advance.questions.per.page"
+							 		   tooltipKey="label.authoring.advance.questions.per.page.tooltip"
+							 		   tooltipDescriptionKey="label.authoring.advance.questions.per.page.tooltip.description"
+						>
+                           <option>All</option>
+                           <option>All</option>
+                           <option>All</option>
+                        </lams:Dropdown>
+                                    
+                        <lams:Switch name="question-numbering" checked="true" 
+							 labelKey="label.authoring.advance.numbered.questions"
+							 tooltipKey="label.authoring.advance.numbered.questions.tooltip"
+							 tooltipDescriptionKey="label.authoring.advance.numbered.questions.tooltip.description"
+						/>
+						
+						<lams:Dropdown name="time-limit" 
+                   					   labelKey="label.authoring.advance.time.limit"
+							 		   tooltipKey="label.authoring.advance.time.limit.tooltip"
+							 		   tooltipDescriptionKey="label.authoring.advance.time.limit.tooltip.description"
+						>
+                           <option>All</option>
+                           <option>All</option>
+                           <option>All</option>
+                        </lams:Dropdown>
+                        		
+						<lams:Dropdown name="attempts-allowed" 
+                   					   labelKey="label.authoring.advance.attempts.allowed"
+							 		   tooltipKey="label.authoring.advance.attempts.allowed.tooltip"
+							 		   tooltipDescriptionKey="label.authoring.advance.attempts.allowed.tooltip.description"
+						>
+                           <option>1</option>
+                           <option>1</option>
+                           <option>1</option>
+                        </lams:Dropdown>
+                        
+						<lams:Dropdown name="passing-mark" 
+                   					   labelKey="label.authoring.advance.passing.mark"
+							 		   tooltipKey="label.authoring.advance.passing.mark.tooltip"
+							 		   tooltipDescriptionKey="label.authoring.advance.passing.mark.tooltip.description"
+						>
+                            <option>None</option>
+                            <option>None</option>
+                            <option>None</option>
+                        </lams:Dropdown>
+					</div>
+					
 					<div class="col-12 col-xl-6 pr-4">
-                                    <div class="form-group row">
-                                        <label class="col-sm-8 col-form-label" for="questionsPerPage">Questions per page <a  tabindex="0" role="button" data-toggle="tooltip" title="Vivamus sagittis lacus vel augue laoreet rutrum faucibus."><i class="info_icon fa fa-info-circle text-info fa-fw" aria-label="Help with Questions per page"></i></a></label>
-                                         <div class="col-sm-4 justify-content-end d-flex">
-                                            <select class="form-control form-control-select" id="questionsPerPage" aria-label="Options for gate" tabindex="0">
-                                                <option>All</option>
-                                                <option>All</option>
-                                                <option>All</option>
-                                            </select>
-                                        </div>     
-                                    </div>    
-						<div class="form-group row">
-							<label class="col-sm-8 col-form-label" for="shuffleQuestions">Shuffle questions  <a tabindex="0" role="button" data-toggle="tooltip" title="Vivamus sagittis lacus vel augue laoreet rutrum faucibus."><i class="info_icon fa fa-info-circle text-info fa-fw" aria-label="Help with Questions per page"></i></a></label>
-                                        <div class="col-sm-4 justify-content-end d-flex">
-                                            <label class="switch" >
-                                              <input type="checkbox" id="shuffleQuestions" checked="">
-                                              <span class="slider round"></span>
-                                            </label>
-                                        </div>    
-						</div>
-						<div class="form-group row">
-							<label class="col-sm-8 col-form-label" for="">Enable question numbering <a tabindex="0" role="button" data-toggle="tooltip" title="Vivamus sagittis lacus vel augue laoreet rutrum faucibus."><i class="info_icon fa fa-info-circle text-info fa-fw" aria-label="Help with Questions per page"></i></a></label>
-                                        <div class="col-sm-4 justify-content-end d-flex">
-                                            <label class="switch">
-                                              <input type="checkbox" checked="">
-                                              <span class="slider round"></span>
-                                            </label>
-                                        </div>
-						</div>
-						<div class="form-group row">
-							<label class="col-sm-8 col-form-label" for="option11">Time limit (minutes) <a tabindex="0" role="button" data-toggle="tooltip" title="Vivamus sagittis lacus vel augue laoreet rutrum faucibus."><i class="info_icon fa fa-info-circle text-info fa-fw" aria-label="Help with Questions per page"></i></a></label>
-                                        <div class="col-sm-4 justify-content-end d-flex">
-                                            <select id="option11" class="form-control form-control-select" aria-label="">
-                                                <option>All</option>
-                                                <option>All</option>
-                                                <option>All</option>
-                                            </select>
-                                        </div>
-						</div>
-						<div class="form-group row">
-							<label class="col-sm-8 col-form-label" for="">Attempts allowed <a tabindex="0" role="button" data-toggle="tooltip" title="Vivamus sagittis lacus vel augue laoreet rutrum faucibus."><i class="info_icon fa fa-info-circle text-info fa-fw" aria-label="Help with Questions per page"></i></a></label>
-                                        <div class="col-sm-4 justify-content-end d-flex">
-                                            <select class="form-control form-control-select" aria-label="">
-                                                <option>1</option>
-                                                <option>1</option>
-                                                <option>1</option>
-                                            </select>
-                                        </div>
-						</div>
-						<div class="form-group row">
-							<label class="col-sm-8 col-form-label" for="">Assessment passing mark <span class="info_icon" data-toggle="tooltip" title="Vivamus sagittis lacus vel augue laoreet rutrum faucibus.">i</span></label>
-                                        <div class="col-sm-4 justify-content-end d-flex">
-                                            <select class="form-control form-control-select" aria-label="">
-                                                <option>None</option>
-                                                <option>None</option>
-                                                <option>None</option>
-                                            </select>
-                                        </div>
-						</div>
+						<lams:Switch name="shuffle-questions" checked="true" 
+									 labelKey="label.authoring.basic.shuffle.the.choices"
+									 tooltipKey="label.authoring.basic.shuffle.the.choices.tooltip"
+									 tooltipDescriptionKey="label.authoring.basic.shuffle.the.choices.tooltip.description"
+						/>
+						
+						<lams:Switch name="display-all"
+									 labelKey="label.authoring.advance.display.summary"
+									 tooltipKey="label.authoring.advance.display.summary.tooltip"
+									 tooltipDescriptionKey="label.authoring.advance.display.summary.tooltip.description"
+						/>
+						
+                       <lams:Switch name="display-over-all" checked="true" 
+									labelKey="label.authoring.advance.allow.students.overall.feedback"
+									tooltipKey="label.authoring.advance.allow.students.overall.feedback.tooltip"
+									tooltipDescriptionKey="label.authoring.advance.allow.students.overall.feedback.tooltip.description"
+						/>
+						
+						<lams:Switch name="allow-learners"
+									 labelKey="label.authoring.advance.allow.students.grades"
+									 tooltipKey="label.authoring.advance.allow.students.grades.tooltip"
+									 tooltipDescriptionKey="label.authoring.advance.allow.students.grades.tooltip.description"
+						/>
+						
+						<lams:Switch name="enable-justification" checked="true" 
+									labelKey="label.authoring.advance.answer.justification"
+									tooltipKey="label.authoring.advance.answer.justification.tooltip"
+									tooltipDescriptionKey="label.authoring.advance.answer.justification.tooltip.description"
+						/>
+						
+						<lams:Switch name="enable-confidence"
+									 labelKey="label.enable.confidence.levels"
+									 tooltipKey="label.enable.confidence.levels.tooltip"
+									 tooltipDescriptionKey="label.enable.confidence.levels.tooltip.description"
+						/>
 					</div>
-					<div class="col-12 col-xl-6 pr-2">
-							<div class="form-group row">
-							<label class="col-sm-10 col-form-label" for="">Display all questions & answers once the learner finishes <a tabindex="0" role="button" data-toggle="tooltip" title="Vivamus sagittis lacus vel augue laoreet rutrum faucibus."><i class="info_icon fa fa-info-circle text-info fa-fw" aria-label="Help with Questions per page"></i></a></label>
-                                        <div class="col-sm-2 justify-content-end d-flex">
-                                            <label class="switch">
-                                              <input type="checkbox" checked="">
-                                              <span class="slider round"></span>
-                                            </label>
-                                         </div>    
-						</div>
-						<div class="form-group row">
-							<label class="col-sm-10 col-form-label" for="">Display overall feedback at the end of each attempt</label>
-							<div class="col-sm-2 justify-content-end d-flex">
-                                            <label class="switch">
-							     <input type="checkbox">
-							     <span class="slider round"></span>        
-							     </label>
-                                        </div>    
-						</div>
-						<div class="form-group row">
-							<label class="col-sm-9 col-form-label" for="">Allow learners to see grades at the end of each attempt <a tabindex="0" role="button" data-toggle="tooltip" title="Vivamus sagittis lacus vel augue laoreet rutrum faucibus."><i class="info_icon fa fa-info-circle text-info fa-fw" aria-label="Help with Questions per page"></i></a></label>
-                                        <div class="col-sm-3 justify-content-end d-flex">
-                                            <label class="switch">
-                                              <input type="checkbox" checked="">
-                                              <span class="slider round"></span>
-                                            </label>
-                                        </div>    
-						</div>
-						<div class="form-group row">
-							<label class="col-sm-9 col-form-label" for="">Enable answer justification <a tabindex="0" role="button" data-toggle="tooltip" title="Vivamus sagittis lacus vel augue laoreet rutrum faucibus."><i class="info_icon fa fa-info-circle text-info fa-fw" aria-label="Help with Questions per page"></i></a></label>
-                                        <div class="col-sm-3 justify-content-end d-flex">
-                                            <label class="switch">
-                                              <input type="checkbox">
-                                              <span class="slider round"></span>
-                                            </label>
-                                        </div>    
-						</div>
-						<div class="form-group row">
-							<label class="col-sm-9 col-form-label" for="">Enable confidence level <a tabindex="0" role="button" data-toggle="tooltip" title="Vivamus sagittis lacus vel augue laoreet rutrum faucibus."><i class="info_icon fa fa-info-circle text-info fa-fw" aria-label="Help with Questions per page"></i></a></label>
-                                        <div class="col-sm-3 justify-content-end d-flex">
-                                            <label class="switch">
-                                              <input type="checkbox">
-                                              <span class="slider round"></span>
-                                            </label>
-                                        </div>    
-						</div>
-					</div>
 				</lams:Panel>
 				
 				<lams:Panel id="outcomes" titleKey="outcome.authoring.title" icon="${lamsUrl}images/components/assess-icon7.svg" colorClass="green2" expanded="false">
-				
+				<div class="col-12 col-xl-6 pr-5">
+                   		<lams:Dropdown name="questions-per-page" 
+                   					   labelKey="label.authoring.advance.questions.per.page"
+							 		   tooltipKey="label.authoring.advance.questions.per.page.tooltip"
+							 		   tooltipDescriptionKey="label.authoring.advance.questions.per.page.tooltip.description"
+						>
+                           <option>All</option>
+                           <option>All</option>
+                           <option>All</option>
+                        </lams:Dropdown>
+                                    
+                        <lams:Switch name="question-numbering" checked="true" 
+							 labelKey="label.authoring.advance.numbered.questions"
+							 tooltipKey="label.authoring.advance.numbered.questions.tooltip"
+							 tooltipDescriptionKey="label.authoring.advance.numbered.questions.tooltip.description"
+						/>
+						
+						<lams:Dropdown name="time-limit" 
+                   					   labelKey="label.authoring.advance.time.limit"
+							 		   tooltipKey="label.authoring.advance.time.limit.tooltip"
+							 		   tooltipDescriptionKey="label.authoring.advance.time.limit.tooltip.description"
+						>
+                           <option>All</option>
+                           <option>All</option>
+                           <option>All</option>
+                        </lams:Dropdown>
+                        		
+						<lams:Dropdown name="attempts-allowed" 
+                   					   labelKey="label.authoring.advance.attempts.allowed"
+							 		   tooltipKey="label.authoring.advance.attempts.allowed.tooltip"
+							 		   tooltipDescriptionKey="label.authoring.advance.attempts.allowed.tooltip.description"
+						>
+                           <option>1</option>
+                           <option>1</option>
+                           <option>1</option>
+                        </lams:Dropdown>
+                        
+						<lams:Dropdown name="passing-mark" 
+                   					   labelKey="label.authoring.advance.passing.mark"
+							 		   tooltipKey="label.authoring.advance.passing.mark.tooltip"
+							 		   tooltipDescriptionKey="label.authoring.advance.passing.mark.tooltip.description"
+						>
+                            <option>None</option>
+                            <option>None</option>
+                            <option>None</option>
+                        </lams:Dropdown>
+					</div>
+					
 					<div class="col-12 col-xl-6 pr-4">
-                       	<div class="form-group row">
-                                       <label class="col-sm-8 col-form-label" for="questionsPerPage">Questions per page <a  tabindex="0" role="button" data-toggle="tooltip" title="Vivamus sagittis lacus vel augue laoreet rutrum faucibus."><i class="info_icon fa fa-info-circle text-info fa-fw" aria-label="Help with Questions per page"></i></a></label>
-                                        <div class="col-sm-4 justify-content-end d-flex">
-                                           <select class="form-control form-control-select" id="questionsPerPage" aria-label="Options for gate" tabindex="0">
-                                               <option>All</option>
-                                               <option>All</option>
-                                               <option>All</option>
-                                           </select>
-                                       </div>     
-                                   </div>    
-						<div class="form-group row">
-							<label class="col-sm-8 col-form-label" for="shuffleQuestions">Shuffle questions  <a tabindex="0" role="button" data-toggle="tooltip" title="Vivamus sagittis lacus vel augue laoreet rutrum faucibus."><i class="info_icon fa fa-info-circle text-info fa-fw" aria-label="Help with Questions per page"></i></a></label>
-                                        <div class="col-sm-4 justify-content-end d-flex">
-                                            <label class="switch" >
-                                              <input type="checkbox" id="shuffleQuestions" checked="">
-                                              <span class="slider round"></span>
-                                            </label>
-                                        </div>    
-						</div>
-						<div class="form-group row">
-							<label class="col-sm-8 col-form-label" for="">Enable question numbering <a tabindex="0" role="button" data-toggle="tooltip" title="Vivamus sagittis lacus vel augue laoreet rutrum faucibus."><i class="info_icon fa fa-info-circle text-info fa-fw" aria-label="Help with Questions per page"></i></a></label>
-                                        <div class="col-sm-4 justify-content-end d-flex">
-                                            <label class="switch">
-                                              <input type="checkbox" checked="">
-                                              <span class="slider round"></span>
-                                            </label>
-                                        </div>
-						</div>
-						<div class="form-group row">
-							<label class="col-sm-8 col-form-label" for="option11">Time limit (minutes) <a tabindex="0" role="button" data-toggle="tooltip" title="Vivamus sagittis lacus vel augue laoreet rutrum faucibus."><i class="info_icon fa fa-info-circle text-info fa-fw" aria-label="Help with Questions per page"></i></a></label>
-                                        <div class="col-sm-4 justify-content-end d-flex">
-                                            <select id="option11" class="form-control form-control-select" aria-label="">
-                                                <option>All</option>
-                                                <option>All</option>
-                                                <option>All</option>
-                                            </select>
-                                        </div>
-						</div>
-						<div class="form-group row">
-							<label class="col-sm-8 col-form-label" for="">Attempts allowed <a tabindex="0" role="button" data-toggle="tooltip" title="Vivamus sagittis lacus vel augue laoreet rutrum faucibus."><i class="info_icon fa fa-info-circle text-info fa-fw" aria-label="Help with Questions per page"></i></a></label>
-                                        <div class="col-sm-4 justify-content-end d-flex">
-                                            <select class="form-control form-control-select" aria-label="">
-                                                <option>1</option>
-                                                <option>1</option>
-                                                <option>1</option>
-                                            </select>
-                                        </div>
-						</div>
-						<div class="form-group row">
-							<label class="col-sm-8 col-form-label" for="">Assessment passing mark <span class="info_icon" data-toggle="tooltip" title="Vivamus sagittis lacus vel augue laoreet rutrum faucibus.">i</span></label>
-                                        <div class="col-sm-4 justify-content-end d-flex">
-                                            <select class="form-control form-control-select" aria-label="">
-                                                <option>None</option>
-                                                <option>None</option>
-                                                <option>None</option>
-                                            </select>
-                                        </div>
-						</div>
+						<lams:Switch name="shuffle-questions" checked="true" 
+									 labelKey="label.authoring.basic.shuffle.the.choices"
+									 tooltipKey="label.authoring.basic.shuffle.the.choices.tooltip"
+									 tooltipDescriptionKey="label.authoring.basic.shuffle.the.choices.tooltip.description"
+						/>
+						
+						<lams:Switch name="display-all"
+									 labelKey="label.authoring.advance.display.summary"
+									 tooltipKey="label.authoring.advance.display.summary.tooltip"
+									 tooltipDescriptionKey="label.authoring.advance.display.summary.tooltip.description"
+						/>
+						
+                       <lams:Switch name="display-over-all" checked="true" 
+									labelKey="label.authoring.advance.allow.students.overall.feedback"
+									tooltipKey="label.authoring.advance.allow.students.overall.feedback.tooltip"
+									tooltipDescriptionKey="label.authoring.advance.allow.students.overall.feedback.tooltip.description"
+						/>
+						
+						<lams:Switch name="allow-learners"
+									 labelKey="label.authoring.advance.allow.students.grades"
+									 tooltipKey="label.authoring.advance.allow.students.grades.tooltip"
+									 tooltipDescriptionKey="label.authoring.advance.allow.students.grades.tooltip.description"
+						/>
+						
+						<lams:Switch name="enable-justification" checked="true" 
+									labelKey="label.authoring.advance.answer.justification"
+									tooltipKey="label.authoring.advance.answer.justification.tooltip"
+									tooltipDescriptionKey="label.authoring.advance.answer.justification.tooltip.description"
+						/>
+						
+						<lams:Switch name="enable-confidence"
+									 labelKey="label.enable.confidence.levels"
+									 tooltipKey="label.enable.confidence.levels.tooltip"
+									 tooltipDescriptionKey="label.enable.confidence.levels.tooltip.description"
+						/>
 					</div>
-					<div class="col-12 col-xl-6 pr-2">
-							<div class="form-group row">
-							<label class="col-sm-10 col-form-label" for="">Display all questions & answers once the learner finishes <a tabindex="0" role="button" data-toggle="tooltip" title="Vivamus sagittis lacus vel augue laoreet rutrum faucibus."><i class="info_icon fa fa-info-circle text-info fa-fw" aria-label="Help with Questions per page"></i></a></label>
-                                        <div class="col-sm-2 justify-content-end d-flex">
-                                            <label class="switch">
-                                              <input type="checkbox" checked="">
-                                              <span class="slider round"></span>
-                                            </label>
-                                         </div>    
-						</div>
-						<div class="form-group row">
-							<label class="col-sm-10 col-form-label" for="">Display overall feedback at the end of each attempt</label>
-							<div class="col-sm-2 justify-content-end d-flex">
-                                            <label class="switch">
-							     <input type="checkbox">
-							     <span class="slider round"></span>        
-							     </label>
-                                        </div>    
-						</div>
-						<div class="form-group row">
-							<label class="col-sm-9 col-form-label" for="">Allow learners to see grades at the end of each attempt <a tabindex="0" role="button" data-toggle="tooltip" title="Vivamus sagittis lacus vel augue laoreet rutrum faucibus."><i class="info_icon fa fa-info-circle text-info fa-fw" aria-label="Help with Questions per page"></i></a></label>
-                                        <div class="col-sm-3 justify-content-end d-flex">
-                                            <label class="switch">
-                                              <input type="checkbox" checked="">
-                                              <span class="slider round"></span>
-                                            </label>
-                                        </div>    
-						</div>
-						<div class="form-group row">
-							<label class="col-sm-9 col-form-label" for="">Enable answer justification <a tabindex="0" role="button" data-toggle="tooltip" title="Vivamus sagittis lacus vel augue laoreet rutrum faucibus."><i class="info_icon fa fa-info-circle text-info fa-fw" aria-label="Help with Questions per page"></i></a></label>
-                                        <div class="col-sm-3 justify-content-end d-flex">
-                                            <label class="switch">
-                                              <input type="checkbox">
-                                              <span class="slider round"></span>
-                                            </label>
-                                        </div>    
-						</div>
-						<div class="form-group row">
-							<label class="col-sm-9 col-form-label" for="">Enable confidence level <a tabindex="0" role="button" data-toggle="tooltip" title="Vivamus sagittis lacus vel augue laoreet rutrum faucibus."><i class="info_icon fa fa-info-circle text-info fa-fw" aria-label="Help with Questions per page"></i></a></label>
-                                        <div class="col-sm-3 justify-content-end d-flex">
-                                            <label class="switch">
-                                              <input type="checkbox">
-                                              <span class="slider round"></span>
-                                            </label>
-                                        </div>    
-						</div>
-					</div>
 				</lams:Panel>
 			</div>
            </div>