Index: lams_tool_assessment/web/WEB-INF/tags/Switch.tag
===================================================================
diff -u
--- lams_tool_assessment/web/WEB-INF/tags/Switch.tag	(revision 0)
+++ lams_tool_assessment/web/WEB-INF/tags/Switch.tag	(revision 1cb9d25feee29b24d2e09b9f4886b2ab00dcc5e1)
@@ -0,0 +1,42 @@
+<% 
+ /**
+  * Switch.tag
+  *	Author: Marcin Cieslak
+  *	Description: Displays a row with a label and a styled checkbox
+  */
+ %>
+<%@ 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="checked" required="false" 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="checked" value="${empty checked ? false : checked}" />
+<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 switch switch-sm">
+		<input type="checkbox" class="switch" name="${name}" id="${id}" ${checked ? ' checked' : ''}>
+		<label for="${id}" />
+    </div>
+</div>					
\ No newline at end of file
Index: lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r401446f02295bfab1a1a863eb02098f12ee7ceb8 -r1cb9d25feee29b24d2e09b9f4886b2ab00dcc5e1
--- lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 401446f02295bfab1a1a863eb02098f12ee7ceb8)
+++ lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 1cb9d25feee29b24d2e09b9f4886b2ab00dcc5e1)
@@ -417,4 +417,8 @@
 	    <name>PageComponent</name>
 		<path>/WEB-INF/tags/PageComponent.tag</path>
    	</tag-file>  
+   	<tag-file>
+	    <name>Switch</name>
+		<path>/WEB-INF/tags/Switch.tag</path>
+   	</tag-file>  
 </taglib>
Index: lams_tool_assessment/web/pages/authoring/authoring5.jsp
===================================================================
diff -u -r401446f02295bfab1a1a863eb02098f12ee7ceb8 -r1cb9d25feee29b24d2e09b9f4886b2ab00dcc5e1
--- lams_tool_assessment/web/pages/authoring/authoring5.jsp	(.../authoring5.jsp)	(revision 401446f02295bfab1a1a863eb02098f12ee7ceb8)
+++ lams_tool_assessment/web/pages/authoring/authoring5.jsp	(.../authoring5.jsp)	(revision 1cb9d25feee29b24d2e09b9f4886b2ab00dcc5e1)
@@ -173,24 +173,24 @@
 				
 				<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>    
+                        <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: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="switchquestionnumbering">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 switch switch-sm">
-								<input type="checkbox" checked="" class="switch" id="switchquestionnumbering">
-								<label for="switchquestionnumbering" />
-                                        </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="">
@@ -222,54 +222,41 @@
 						</div>
 					</div>
 					<div class="col-12 col-xl-6 pr-4">
-						<div class="form-group row">
-							<label class="col-sm-8 col-form-label" for="switchshufflequestions">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 switch switch-sm">
-								<input type="checkbox" checked="" class="switch" id="switchshufflequestions">
-								<label for="switchshufflequestions" />
-                                        </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"
+						/>
 						
-                                    <div class="form-group row">
-							<label class="col-sm-8 col-form-label" for="switchdisplayall">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-4 justify-content-end d-flex switch switch-sm">
-								<input type="checkbox" class="switch" id="switchdisplayall">
-								<label for="switchdisplayall" />
-                                        </div>
-						</div>
+						<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"
+						/>
 						
-						<div class="form-group row">
-							<label class="col-sm-8 col-form-label" for="switchdisplayoverall">Display overall feedback 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-4 justify-content-end d-flex switch switch-sm">
-								<input type="checkbox" checked="" class="switch" id="switchdisplayoverall">
-								<label for="switchdisplayoverall" />
-                                        </div>
-						</div>
+						<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"
+						/>
 						
-						<div class="form-group row">
-							<label class="col-sm-8 col-form-label" for="switchallowlearners">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-4 justify-content-end d-flex switch switch-sm">
-								<input type="checkbox" class="switch" id="switchallowlearners">
-								<label for="switchallowlearners" />
-                                        </div>
-						</div>
+						<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"
+						/>
 						
-						<div class="form-group row">
-							<label class="col-sm-8 col-form-label" for="switchenablejustification">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-4 justify-content-end d-flex switch switch-sm">
-								<input type="checkbox" class="switch" id="switchenablejustification">
-								<label for="switchenablejustification" />
-                                        </div>
-						</div>
-						
-						<div class="form-group row">
-							<label class="col-sm-8 col-form-label" for="switchenableconfidence">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-4 justify-content-end d-flex switch switch-sm">
-								<input type="checkbox" checked="" class="switch" id="switchenableconfidence">
-								<label for="switchenableconfidence" />
-                                        </div>
-						</div>
+						<lams:Switch name="enable-confidence"
+									 labelKey="label.enable.confidence.levels"
+									 tooltipKey="label.enable.confidence.levels.tooltip"
+									 tooltipDescriptionKey="label.enable.confidence.levels.tooltip.description"
+						/>
 					</div>
 				</lams:Panel>