Index: lams_central/web/css/components.css
===================================================================
diff -u -rdfbb99403c997cedf75b210c97abd2901cdf8ba1 -r0f9383f9d86431069e92c353d0a84b43efa5b128
--- lams_central/web/css/components.css	(.../components.css)	(revision dfbb99403c997cedf75b210c97abd2901cdf8ba1)
+++ lams_central/web/css/components.css	(.../components.css)	(revision 0f9383f9d86431069e92c353d0a84b43efa5b128)
@@ -1,482 +1,524 @@
 @font-face {
-  font-family: mont-semibold;
-  src: url(../fonts/mont-semibold.ttf);
+	font-family: mont-semibold;
+	src: url(../fonts/mont-semibold.ttf);
 }
+
 @font-face {
-  font-family: mont-bold;
-  src: url(../fonts/FontsFree-Net-Mont-Bold.ttf);
+	font-family: mont-bold;
+	src: url(../fonts/FontsFree-Net-Mont-Bold.ttf);
 }
+
 @font-face {
-  font-family: mont-regular;
-  src: url(../fonts/FontsFree-Net-Mont1.ttf);
+	font-family: mont-regular;
+	src: url(../fonts/FontsFree-Net-Mont1.ttf);
 }
-body, html{
-    margin:0;
-    font-size: 16px;
-    background-color: #E4E4E4;  
+
+body, html {
+	margin: 0;
+	font-size: 16px;
+	background-color: #E4E4E4;
 }
 
 .sr-only, .sr-only-focusable, .sr-only:hover {
-    color: black;
+	color: black;
 }
 
-img{
-    max-width: 100%;
+img {
+	max-width: 100%;
 }
 
-.wrapper{
-    border-radius: 2rem;
-    min-height: 100vh;
-    overflow: hidden;
-    background-color: #F6F5FA;
+.wrapper {
+	border-radius: 2rem;
+	min-height: 100vh;
+	overflow: hidden;
+	background-color: #F6F5FA;
 }
 
-.main-content{
-    background-color: #fff;
+.main-content {
+	background-color: #fff;
 }
-.main-content-inner{
-    min-height: 100%;
-    background-color: #F6F5FA;
-    border-radius: 2rem;
-    padding: 2rem 4.8rem;
+
+.main-content-inner {
+	min-height: 100%;
+	background-color: #F6F5FA;
+	border-radius: 2rem;
+	padding: 2rem 4.8rem;
 }
 
-.top-menu-btn a{
-    display: inline-block;
-    background-color: #3C42E0;
-    width: 3.1rem;
-    height: 3.1rem;
-    border-radius: 1rem;
-    margin-left: .6rem;
-    text-align: center;
-    line-height: 2.8rem;
-    box-shadow: 0px 3px 6px #3C42E040;
-    transition: all .3s ease;
+.top-menu-btn a {
+	display: inline-block;
+	background-color: #3C42E0;
+	width: 3.1rem;
+	height: 3.1rem;
+	border-radius: 1rem;
+	margin-left: .6rem;
+	text-align: center;
+	line-height: 2.8rem;
+	box-shadow: 0px 3px 6px #3C42E040;
+	transition: all .3s ease;
 }
+
 .top-menu-btn a:hover {
-    background-color: #878bea;
- }
+	background-color: #878bea;
+}
 
-.top-menu-btn a img{
-    width: 1rem;
+.top-menu-btn a img {
+	width: 1rem;
 }
 
-.top-menu-btn a:nth-child(3) img{
-    width: 1.3rem;
+.top-menu-btn a:nth-child(3) img {
+	width: 1.3rem;
 }
-.top-menu form{
-    position: relative;
-    width: 18.8rem;
-    margin-right: 3rem;
+
+.top-menu form {
+	position: relative;
+	width: 18.8rem;
+	margin-right: 3rem;
 }
-.top-menu input{
-    width: 100%;
-    height: 3.1rem;
-    border-radius: 1rem;
-    border:0;
-    background-color: #fff;
-    padding-left: 1.2rem;
-    box-shadow: 0px 3px 6px rgba(0,0,0,0.02);
-    font-size: .95rem;
+
+.top-menu input {
+	width: 100%;
+	height: 3.1rem;
+	border-radius: 1rem;
+	border: 0;
+	background-color: #fff;
+	padding-left: 1.2rem;
+	box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.02);
+	font-size: .95rem;
 }
-.top-menu form img{
-    position: absolute;
-    right: 1.2rem;
-    top: .9rem;
-    cursor: pointer;
-    width: 1.2rem;
+
+.top-menu form img {
+	position: absolute;
+	right: 1.2rem;
+	top: .9rem;
+	cursor: pointer;
+	width: 1.2rem;
 }
-.top-menu input::placeholder{
-color: #696f7d;
+
+.top-menu input::placeholder {
+	color: #696f7d;
 }
 
-.content{
-    
+.content {
+	
 }
 
-.content-left{
--ms-flex: 0 0 26.5rem;
-    flex: 0 0 26.5rem;
-    max-width: 26.5rem;
+.content-left {
+	-ms-flex: 0 0 26.5rem;
+	flex: 0 0 26.5rem;
+	max-width: 26.5rem;
 }
-.content-right{
--ms-flex: 0 0 calc(100% - 26.5rem);
-    flex: 0 0 calc(100% - 26.5rem);
-    max-width: calc(100% - 26.5rem);
+
+.content-right {
+	-ms-flex: 0 0 calc(100% - 26.5rem);
+	flex: 0 0 calc(100% - 26.5rem);
+	max-width: calc(100% - 26.5rem);
 }
 
-
 .bbox-col {
-    box-shadow: 0px 20px 20px #2E384D1A;
-    background-color: #fff;
-    border-radius: 1.2rem;
-    margin-top: 1.8rem;
-    padding: 1.5rem 2rem;
-    min-height: 100%;
+	box-shadow: 0px 20px 20px #2E384D1A;
+	background-color: #fff;
+	border-radius: 1.2rem;
+	margin-top: 1.8rem;
+	padding: 1.5rem 2rem;
+	min-height: 100%;
 }
 
 .grey_title h2 {
-    font-size: 1.35rem;
+	font-size: 1.35rem;
 }
 
-.bbox-col-gate p{
-    color: #2E384D;
-    font-family: mont-regular, sans-serif;
-    font-size: .8rem;
-    margin:0;
-    margin-top: .6rem;
+.bbox-col-gate p {
+	color: #2E384D;
+	font-family: mont-regular, sans-serif;
+	font-size: .8rem;
+	margin: 0;
+	margin-top: .6rem;
 }
 
-.bbox-col-gate select:focus{
-    outline: none;
+.bbox-col-gate select:focus {
+	outline: none;
 }
 
-
-.main-content{
-    width: 100%;
+.main-content {
+	width: 100%;
 }
+
 .graph-con {
-    min-height: 12rem;
-    width: calc(100% - 8rem);
-    overflow: hidden;
-min-height: 11.11rem !important;
+	min-height: 12rem;
+	width: calc(100% - 8rem);
+	overflow: hidden;
+	min-height: 11.11rem !important;
 }
 
 input::-webkit-input-placeholder {
-    color:  #626262
-;
+	color: #626262;
 }
+
 input::-moz-placeholder {
-    color: #626262
-;
+	color: #626262;
 }
-.bbox-col.d-flex{
-    position: relative;
-    padding: 1rem 2rem;
-    min-height: auto;
+
+.bbox-col.d-flex {
+	position: relative;
+	padding: 1rem 2rem;
+	min-height: auto;
 }
 
-.bbox-left.icon {
-    position: absolute;
-    left: 0;
-    top: 0;
-    bottom: 0;
-    padding: 1.25rem 1.5rem;
-    border-top-left-radius: 1.25rem;
-    border-bottom-left-radius: 1.25rem;
+.bbox-left {
+	position: absolute;
+	left: 0;
+	top: 0;
+	bottom: 0;
+	padding: 1.25rem 1.5rem;
+	border-top-left-radius: 1.25rem;
+	border-bottom-left-radius: 1.25rem;
 }
-.bbox-left.icon i{
-    font-size: 1.5rem;
+
+.bbox-left.green {
+	background: #CDF5F7;
+	color: #05CCD6;
 }
-.bbox-left.icon.green{
-    background: #CDF5F7;
-    color: #05CCD6;
+
+.bbox-left.yellow {
+	background: #FFEECC;
+	color: #FFAA00;
 }
-.bbox-left.icon.yellow{
-    background: #FFEECC;
-    color: #FFAA00;
+
+.bbox-left.purple {
+	background: #F5E5F9;
+	color: #CC7FE2;
 }
-.bbox-left.icon.purple{
-    background: #F5E5F9;
-    color: #CC7FE2;
+
+.bbox-left.blue {
+	background: #E2E3FE;
+	color: #7075F9;
 }
-.bbox-left.icon.blue{
-    background: #E2E3FE;
-    color: #7075F9;
+
+.bbox-left.green2 {
+	background: #E5F8EC;
+	color: #97E0B3;
 }
-.bbox-left.icon.green2{
-    background: #E5F8EC;
-    color: #97E0B3;
+
+.bbox-left i.fa {
+	font-size: 1.5rem;
 }
-.bbox-right.bbox_body{
-    padding-left: 3.25rem;
-    width: 100%;
+
+.bbox-left span.no-icon {
+	padding-left: 1.12rem;
 }
-.bbox-right.bbox_body .grey_title {
-    font-size: 1.25rem;
-    color: #6c757d;
-    position: relative;
-    cursor: pointer;
+
+.bbox_body {
+	padding-left: 3.25rem;
+	width: 100%;
 }
-.bbox-right.bbox_body .grey_title a {
-    font-size: 1.25rem;
-    font-weight: 500;
-    color: #6c757d;
-    position: relative;
-    cursor: pointer;
-    display:block;
-    width: 100%;
+
+.bbox_body .grey_title {
+	font-size: 1.25rem;
+	color: #6c757d;
+	position: relative;
+	cursor: pointer;
 }
 
-.bbox-right.bbox_body input.form-control{
-    border: 0.1rem solid #DFDCE9;
-    border-radius: 1rem;
-    height: 3.25rem;
-    color: black;
-    margin-bottom: .5rem;
-    font-size: 1rem;
+.bbox_body .grey_title a {
+	font-size: 1.25rem;
+	font-weight: 500;
+	color: #6c757d;
+	position: relative;
+	cursor: pointer;
+	display: block;
+	width: 100%;
 }
-.bbox-right.bbox_body input.form-control::placeholder{
-    color: #989EAC;
+
+.bbox_body .grey_title a.no-title {
+	text-decoration: none;
 }
-.bbox-right.bbox_body textarea.form-control{
-    border: 0.1rem solid #DFDCE9;
-    border-radius: 1rem;
-    height: 8.25rem;
-    color: black;
-    resize: none;
-    margin-bottom: .5rem;
+
+.bbox_body input.form-control {
+	border: 0.1rem solid #DFDCE9;
+	border-radius: 1rem;
+	height: 3.25rem;
+	color: black;
+	margin-bottom: .5rem;
+	font-size: 1rem;
 }
-.bbox-right.bbox_body textarea.form-control::placeholder{
-    color: #989EAC;
+
+.bbox_body input.form-control::placeholder {
+	color: #989EAC;
 }
-.bbox-col-gate p.grey_text{
-    color: #677084;
-    font-size: 1rem;
+
+.bbox_body textarea.form-control {
+	border: 0.1rem solid #DFDCE9;
+	border-radius: 1rem;
+	height: 8.25rem;
+	color: black;
+	resize: none;
+	margin-bottom: .5rem;
 }
 
-.info_icon{
-    font-size: .95rem;
+.bbox_body textarea.form-control::placeholder {
+	color: #989EAC;
 }
 
+.bbox-col-gate p.grey_text {
+	color: #677084;
+	font-size: 1rem;
+}
 
-.tablesorter{
-    max-width: 100%;
-    margin-top: .75rem;
+.info_icon {
+	font-size: .95rem;
 }
-.tablesorter-bootstrap:not(.table-dark) thead:not(.thead-dark) .tablesorter-header, .tablesorter-bootstrap:not(.table-dark) tfoot th, .tablesorter-bootstrap:not(.table-dark) tfoot td{
-    background: #fff;
+
+.tablesorter {
+	max-width: 100%;
+	margin-top: .75rem;
 }
-.tablesorter td a{
-    color: #2E384D;
+
+.tablesorter-bootstrap:not (.table-dark ) thead:not (.thead-dark ) .tablesorter-header,
+	.tablesorter-bootstrap:not (.table-dark ) tfoot th,
+	.tablesorter-bootstrap:not (.table-dark ) tfoot td {
+	background: #fff;
 }
-.tablesorter td ul{
-    margin-bottom: 0;
+
+.tablesorter td a {
+	color: #2E384D;
 }
-.tablesorter td input.form-control{
-    height: 2.5rem !important;
-    width: 3.5rem !important;
-    border-radius: 1.1rem !important;
-    text-align: center;
+
+.tablesorter td ul {
+	margin-bottom: 0;
 }
-#questionlist ul.bottom{
-    text-align: right;
-    margin-top: 1rem;
-    margin-bottom: 1rem;
+
+.tablesorter td input.form-control {
+	height: 2.5rem !important;
+	width: 3.5rem !important;
+	border-radius: 1.1rem !important;
+	text-align: center;
 }
 
+#questionlist ul.bottom {
+	text-align: right;
+	margin-top: 1rem;
+	margin-bottom: 1rem;
+}
+
 .form-control-select {
-    border: 0.1rem solid #DFDCE9;
-    border-radius: 1.25rem;
-    color: #696f7d;
-    background-color: #F6F5FA;
+	border: 0.1rem solid #DFDCE9;
+	border-radius: 1.25rem;
+	color: #696f7d;
+	background-color: #F6F5FA;
 }
 
 .tooltip-inner {
-    background-color: #FFFFFF;
-    color: #212529;
-    border: 1px solid #707070;
-    padding: .5rem;
-    font-size: .9rem;
-    text-align: left;
-    line-height: 1.2;
+	background-color: #FFFFFF;
+	color: #212529;
+	border: 1px solid #707070;
+	padding: .5rem;
+	font-size: .9rem;
+	text-align: left;
+	line-height: 1.2;
 }
+
 .tooltip.bs-tooltip-top .arrow:before {
-    border-top-color: #707070 !important;
+	border-top-color: #707070 !important;
 }
 
-.tooltip.bs-tooltip-top .arrow:before{
-    border-color: #fff;
+.tooltip.bs-tooltip-top .arrow:before {
+	border-color: #fff;
 }
-.bbox-right.bbox_body .grey_title.active .icon_open{
-    display: flex;
+
+.bbox-right.bbox_body .grey_title.active .icon_open {
+	display: flex;
 }
-.bbox-right.bbox_body .grey_title.active .icon_close{
-display: none;
+
+.bbox-right.bbox_body .grey_title.active .icon_close {
+	display: none;
 }
-.bbox-right.bbox_body .grey_title .icon_open{
-display: none;
+
+.bbox-right.bbox_body .grey_title .icon_open {
+	display: none;
 }
-.bbox-right.bbox_body .grey_title .icon_close{
-    display: flex;
+
+.bbox-right.bbox_body .grey_title .icon_close {
+	display: flex;
 }
-.bbox-right.bbox_body .grey_title ~ .row.mt-3{
-  padding-left: 1rem;
+
+.bbox-right.bbox_body .grey_title ~ .row.mt-3 {
+	padding-left: 1rem;
 }
 
-
 .badge-primary {
-    color: #fff;
-    background-color: #3C42E0;
+	color: #fff;
+	background-color: #3C42E0;
 }
 
-
 label {
-    color: #6c757d;
+	color: #6c757d;
 }
 
-
-.btn {          
-    border-radius: 1.0rem;
+.btn {
+	border-radius: 1.0rem;
 }
 
-
 .collapsible-link {
-    width: 100%;
-    position: relative;
-    text-align: left;
+	width: 100%;
+	position: relative;
+	text-align: left;
 }
 
 .collapsible-link::before {
-    content: '\f107';
-    position: absolute;
-    top: 50%;
-    right: 0.8rem;
-    transform: translateY(-50%);
-    display: block;
-    font-family: 'FontAwesome';
-    font-size: 1.8rem;
-    
+	content: '\f107';
+	position: absolute;
+	top: 50%;
+	right: 0.8rem;
+	transform: translateY(-50%);
+	display: block;
+	font-family: 'FontAwesome';
+	font-size: 1.8rem;
 }
 
 .collapsible-link[aria-expanded='true']::before {
-    content: '\f139';
-    color: #3C42E0;
+	content: '\f139';
+	color: #3C42E0;
 }
 
 :focus {
-    outline: 3px solid rgba(0,123,255,.25); 
+	outline: 3px solid rgba(0, 123, 255, .25);
 }
 
-
 /* Switch */
 .switch {
-  font-size: 1rem;
-  position: relative;
-  padding-left: 15px;
+	font-size: 1rem;
+	position: relative;
+	padding-left: 15px;
 }
+
 .switch input {
-  position: absolute;
-  height: 1px;
-  width: 1px;
-  background: none;
-  border: 0;
-  clip: rect(0 0 0 0);
-  clip-path: inset(50%);
-  overflow: hidden;
-  padding: 0;
+	position: absolute;
+	height: 1px;
+	width: 1px;
+	background: none;
+	border: 0;
+	clip: rect(0, 0, 0, 0);
+	clip-path: inset(50%);
+	overflow: hidden;
+	padding: 0;
 }
-.switch input + label {
-  position: relative;
-  min-width: calc(calc(2.375rem * .8) * 2);
-  border-radius: calc(2.375rem * .8);
-  height: calc(2.375rem * .8);
-  line-height: calc(2.375rem * .8);
-  display: inline-block;
-  cursor: pointer;
-  outline: none;
-  user-select: none;
-  vertical-align: middle;
-  text-indent: calc(calc(calc(2.375rem * .8) * 2) + .5rem);
+
+.switch input+label {
+	position: relative;
+	min-width: calc(calc(2.375rem * .8)* 2);
+	border-radius: calc(2.375rem * .8);
+	height: calc(2.375rem * .8);
+	line-height: calc(2.375rem * .8);
+	display: inline-block;
+	cursor: pointer;
+	outline: none;
+	user-select: none;
+	vertical-align: middle;
+	text-indent: calc(calc(calc(2.375rem * .8)* 2)+ .5rem);
 }
-.switch input + label::before,
-.switch input + label::after {
-  content: '';
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: calc(calc(2.375rem * .8) * 2);
-  bottom: 0;
-  display: block;
+
+.switch input+label::before, .switch input+label::after {
+	content: '';
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: calc(calc(2.375rem * .8)* 2);
+	bottom: 0;
+	display: block;
 }
-.switch input + label::before {
-  right: 0;
-  background-color: #dee2e6;
-  border-radius: calc(2.375rem * .8);
-  transition: 0.2s all;
+
+.switch input+label::before {
+	right: 0;
+	background-color: #dee2e6;
+	border-radius: calc(2.375rem * .8);
+	transition: 0.2s all;
 }
-.switch input + label::after {
-  top: 2px;
-  left: 2px;
-  width: calc(calc(2.375rem * .8) - calc(2px * 2));
-  height: calc(calc(2.375rem * .8) - calc(2px * 2));
-  border-radius: 50%;
-  background-color: white;
-  transition: 0.2s all;
+
+.switch input+label::after {
+	top: 2px;
+	left: 2px;
+	width: calc(calc(2.375rem * .8)- calc(2px * 2));
+	height: calc(calc(2.375rem * .8)- calc(2px * 2));
+	border-radius: 50%;
+	background-color: white;
+	transition: 0.2s all;
 }
-.switch input:checked + label::before {
-  background-color: #7fdaa1;
+
+.switch input:checked+label::before {
+	background-color: #7fdaa1;
 }
-.switch input:checked + label::after {
-  margin-left: calc(2.375rem * .8);
+
+.switch input:checked+label::after {
+	margin-left: calc(2.375rem * .8);
 }
-.switch input:focus + label::before {
-  outline: none;
-  box-shadow: 0 0 0 0.2rem rgba(0, 136, 221, 0.25);
+
+.switch input:focus+label::before {
+	outline: none;
+	box-shadow: 0 0 0 0.2rem rgba(0, 136, 221, 0.25);
 }
-.switch input:disabled + label {
-  color: #868e96;
-  cursor: not-allowed;
+
+.switch input:disabled+label {
+	color: #868e96;
+	cursor: not-allowed;
 }
-.switch input:disabled + label::before {
-  background-color: #e9ecef;
+
+.switch input:disabled+label::before {
+	background-color: #e9ecef;
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
 .switch.switch-sm {
-  font-size: 1rem;
+	font-size: 1rem;
 }
-.switch.switch-sm input + label {
-  min-width: calc(calc(1.9375rem * .8) * 2);
-  height: calc(1.9375rem * .8);
-  line-height: calc(1.9375rem * .8);
-  text-indent: calc(calc(calc(1.9375rem * .8) * 2) + .5rem);
+
+.switch.switch-sm input+label {
+	min-width: calc(calc(1.9375rem * .8)* 2);
+	height: calc(1.9375rem * .8);
+	line-height: calc(1.9375rem * .8);
+	text-indent: calc(calc(calc(1.9375rem * .8)* 2)+ .5rem);
 }
-.switch.switch-sm input + label::before {
-  width: calc(calc(1.9375rem * .8) * 2);
+
+.switch.switch-sm input+label::before {
+	width: calc(calc(1.9375rem * .8)* 2);
 }
-.switch.switch-sm input + label::after {
-  width: calc(calc(1.9375rem * .8) - calc(2px * 2));
-  height: calc(calc(1.9375rem * .8) - calc(2px * 2));
+
+.switch.switch-sm input+label::after {
+	width: calc(calc(1.9375rem * .8)- calc(2px * 2));
+	height: calc(calc(1.9375rem * .8)- calc(2px * 2));
 }
-.switch.switch-sm input:checked + label::after {
-  margin-left: calc(1.9375rem * .8);
+
+.switch.switch-sm input:checked+label::after {
+	margin-left: calc(1.9375rem * .8);
 }
+
 .switch.switch-lg {
-  font-size: 1.25rem;
+	font-size: 1.25rem;
 }
-.switch.switch-lg input + label {
-  min-width: calc(calc(3rem * .8) * 2);
-  height: calc(3rem * .8);
-  line-height: calc(3rem * .8);
-  text-indent: calc(calc(calc(3rem * .8) * 2) + .5rem);
+
+.switch.switch-lg input+label {
+	min-width: calc(calc(3rem * .8)* 2);
+	height: calc(3rem * .8);
+	line-height: calc(3rem * .8);
+	text-indent: calc(calc(calc(3rem * .8)* 2)+ .5rem);
 }
-.switch.switch-lg input + label::before {
-  width: calc(calc(3rem * .8) * 2);
+
+.switch.switch-lg input+label::before {
+	width: calc(calc(3rem * .8)* 2);
 }
-.switch.switch-lg input + label::after {
-  width: calc(calc(3rem * .8) - calc(2px * 2));
-  height: calc(calc(3rem * .8) - calc(2px * 2));
+
+.switch.switch-lg input+label::after {
+	width: calc(calc(3rem * .8)- calc(2px * 2));
+	height: calc(calc(3rem * .8)- calc(2px * 2));
 }
-.switch.switch-lg input:checked + label::after {
-  margin-left: calc(3rem * .8);
+
+.switch.switch-lg input:checked+label::after {
+	margin-left: calc(3rem * .8);
 }
-.switch + .switch {
-  margin-left: 1rem;
+
+.switch+.switch {
+	margin-left: 1rem;
 }
 
 .dropdown-menu {
-  margin-top: .75rem;
-}
+	margin-top: .75rem;
+}
\ No newline at end of file
Index: lams_tool_assessment/web/WEB-INF/tags/Panel.tag
===================================================================
diff -u -r7d5f9405548509f38da6f00cd3b7774d67430bbe -r0f9383f9d86431069e92c353d0a84b43efa5b128
--- lams_tool_assessment/web/WEB-INF/tags/Panel.tag	(.../Panel.tag)	(revision 7d5f9405548509f38da6f00cd3b7774d67430bbe)
+++ lams_tool_assessment/web/WEB-INF/tags/Panel.tag	(.../Panel.tag)	(revision 0f9383f9d86431069e92c353d0a84b43efa5b128)
@@ -12,25 +12,55 @@
 <c:set var="lams"><lams:LAMSURL/></c:set>
 
 <%@ attribute name="id" required="true" rtexprvalue="true" %>
-<%@ attribute name="titleKey" required="true" rtexprvalue="true" %>
-<%@ attribute name="iconClass" required="true" rtexprvalue="true" %>
-<%@ attribute name="colorClass" required="true" rtexprvalue="true" %>
+<%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="icon" required="false" rtexprvalue="true" %>
+<%@ attribute name="iconClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="colorClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="expanded" required="false" rtexprvalue="true" %>
 
-<%-- Optional attribute --%>
+<c:set var="expanded" value="${empty expanded ? true : expanded}" />
+<%-- Should left panel (icon, color) be displayed at all --%>
+<c:set var="hasLeftPanel" value="${not empty icon or not empty iconClass or not empty colorClass}" />
 
 <div class="col-12 p-0">
 	<div class="bbox-col d-flex slide_col" id="${id}-bbox">
-		<div class="bbox-left icon ${colorClass}">
-			<i class="fa ${iconClass}" aria-hidden="true"></i>
-		</div>
-		<div class="bbox-right bbox_body">
+	
+		<c:if test="${hasLeftPanel}">
+			<div class="bbox-left ${colorClass}">
+				<c:choose>
+					<c:when test="${not empty icon}">
+						<%-- Display regular icon --%>
+						<img src="${icon}">
+					</c:when>
+					<c:when test="${not empty iconClass}">
+						<%-- Display Font Awesome icon --%>
+						<i class="fa ${iconClass}" aria-hidden="true"></i>
+					</c:when>
+					<c:otherwise>
+						<%-- Blank character for padding --%>
+						<span class="no-icon" aria-hidden="true">&nbsp;</span>
+					</c:otherwise>
+				</c:choose>
+			</div>
+		</c:if>
+		
+		<div class="bbox_body ${hasLeftPanel ? 'bbox-right' : ''}">
             <div class="grey_title grey_title1">
-            	<a class="collapsible-link" data-toggle="collapse" href="#${id}-content" data-target="#${id}-content"
-            	   role="button" aria-expanded="false" aria-controls="${id}-content">
-            	   	<h2><fmt:message key="${titleKey}" /></h2>
+            	<c:set var="contentId" value="${id}-content" />
+            	<a class="collapsible-link ${empty titleKey ? ' no-title' : ''}" role="button" href="#${contentId}"
+            	   data-toggle="collapse" data-target="#${contentId}" aria-expanded="${expanded}" aria-controls="${contentId}">
+           	   		<c:choose>
+           	   			<c:when test="${not empty titleKey}">
+           	   				<h2><fmt:message key="${titleKey}" /></h2>
+           	   			</c:when>
+           	   			<c:otherwise>
+           	   				&nbsp;
+           	   			</c:otherwise>
+           	   		</c:choose>
             	</a>
 			</div>
-			<div id="${id}-content" class="row mt-3 collapse">
+			
+			<div id="${id}-content" class="row mt-3 ${expanded ? '' : ' collapse'}">
 				<jsp:doBody />
 			</div>
 		</div>
Index: lams_tool_assessment/web/pages/authoring/authoring5.jsp
===================================================================
diff -u -r7d5f9405548509f38da6f00cd3b7774d67430bbe -r0f9383f9d86431069e92c353d0a84b43efa5b128
--- lams_tool_assessment/web/pages/authoring/authoring5.jsp	(.../authoring5.jsp)	(revision 7d5f9405548509f38da6f00cd3b7774d67430bbe)
+++ lams_tool_assessment/web/pages/authoring/authoring5.jsp	(.../authoring5.jsp)	(revision 0f9383f9d86431069e92c353d0a84b43efa5b128)
@@ -3,6 +3,7 @@
 <%@ page import="org.lamsfoundation.lams.tool.assessment.AssessmentConstants"%>
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 <c:set var="mode" value="${sessionMap.mode}" />
+<c:set var="lamsUrl"><lams:LAMSURL/></c:set>
 
 <lams:html>
 <head>
@@ -71,249 +72,225 @@
 	
 	            <div class="container-fluid" style="max-width: 1600px">
 					<div class="content row">
-						<div id="content" class="col-12 p-0">
-							<div class="bbox-col d-flex" id="bbox1">
-								<div class="bbox-left icon green">
-									<i class="fa fa-file-o"></i>
+						
+						<lams:Panel id="basic" titleKey="label.authoring.heading.basic" iconClass="fa-file-o" colorClass="green">
+							<div class="col-12 p-0">
+								<div class="form-group">
+                                    <label for="title">Title</label>
+                                    <input type="text" id="title" placeholder="Title" class="form-control">
+                                    <label for="instructions">Instructions</label>
+                                    <textarea type="text" id="instructions" placeholder="Enter instructions" class="form-control"></textarea>
+	                            </div>
+                            </div>    
+						</lams:Panel>
+							
+	                	<lams:Panel id="questions" titleKey="label.authoring.basic.question.list.title" iconClass="fa-question-circle-o" colorClass="yellow" expanded="true">
+							<div id="questionlist" >
+								<table class="table table-bordered user-table-data tablesorter tablesorter-bootstrap tablesorterff73dd4148253 hasFilters tablesorter2fb3f6e97d426" role="grid">
+									<colgroup>
+										<col width="85">
+										<col width="900">
+										<col width="220">
+										<col width="100">
+										<col width="180">
+									</colgroup>
+									<thead>
+										<tr role="row" class="tablesorter-headerRow table-sorter-header">
+											<th data-column="0" class="tablesorter-header tablesorter-headerUnSorted" tabindex="0" scope="col" role="columnheader" aria-disabled="false" unselectable="on" aria-sort="none" aria-label="Order #: No sort applied, activate to apply an ascending sort" style="user-select: none;">
+												<div class="tablesorter-header-inner">#</div>
+											</th>
+											<th data-column="1" class="tablesorter-header tablesorter-headerUnSorted" tabindex="0" scope="col" role="columnheader" aria-disabled="false" unselectable="on" aria-sort="none" aria-label="Customer: No sort applied, activate to apply an ascending sort" style="user-select: none;">
+												<div class="tablesorter-header-inner">Question</div>
+											</th>
+											<th data-column="2" class="tablesorter-header tablesorter-headerUnSorted" tabindex="0" scope="col" role="columnheader" aria-disabled="false" unselectable="on" aria-sort="none" aria-label="PO: No sort applied, activate to apply an ascending sort" style="user-select: none;">
+												<div class="tablesorter-header-inner"></div>
+											</th>
+											<th data-column="3" class="tablesorter-header tablesorter-headerUnSorted" tabindex="0" scope="col" role="columnheader" aria-disabled="false" unselectable="on" aria-sort="none" aria-label="Date: No sort applied, activate to apply an ascending sort" style="user-select: none;">
+												<div class="tablesorter-header-inner">Mark</div>
+											</th>
+											<th data-column="4" class="tablesorter-header tablesorter-headerUnSorted" tabindex="0" scope="col" role="columnheader" aria-disabled="false" unselectable="on" aria-sort="none" aria-label="Total: No sort applied, activate to apply an ascending sort" style="user-select: none;">
+												<div class="tablesorter-header-inner"></div>
+											</th>
+										</tr>
+									</thead>
+									<tbody aria-live="polite" aria-relevant="all">
+										<tr role="row" class="tablesorter-hasChildRow table-sorter-top">
+											<td><a href="https://mottie.github.io/tablesorter/docs/example-child-rows.html#" class="toggle">1</a></td>
+											<td>What is the Capital of Botswana?</td>
+											<td>
+												<ul class="list-inline">
+													<li class="list-inline-item"><span class="badge badge-primary">Multiple Choice</span></li>
+													<li class="list-inline-item"><span class="badge badge-primary">V.4</span></li>
+												</ul>
+											</td>
+                                               <td><input type="text" placeholder="1" value="1" aria-label="Points for question: 1" class="form-control"></td>
+											<td>
+												<ul class="list-inline tools">
+													<li class="list-inline-item"><a href="#" aria-label="Answer not required"><i class="fa fa-asterisk" aria-hidden="true"></i></a></li>
+													<li class="list-inline-item"><a href="#" aria-label="Edit"><i class="fa fa-pencil" aria-hidden="true"></i></a></li>
+													<li class="list-inline-item"><a href="#" aria-label="Remove"><i class="fa fa-times" aria-hidden="true"></i></a></li>
+												</ul>
+											</td>
+										</tr>
+										<tr role="row" class="tablesorter-hasChildRow table-sorter-top">
+											<td><a href="https://mottie.github.io/tablesorter/docs/example-child-rows.html#" class="toggle">2</a></td>
+											<td>What is the Capital of Poland?</td>
+											<td>
+												<ul class="list-inline">
+													<li class="list-inline-item"><span class="badge badge-primary">Multiple Choice</span></li>
+													<li class="list-inline-item"><span class="badge badge-primary">V.4</span></li>
+												</ul>
+											</td>
+											<td><input type="text" placeholder="1" value="1" aria-label="Points for question: 1" class="form-control"></td>
+											<td>
+												<ul class="list-inline tools">
+													<li class="list-inline-item"><a href="#" aria-label="Answer not required"><i class="fa fa-asterisk" aria-hidden="true"></i></a></li>
+													<li class="list-inline-item"><a href="#" aria-label="Edit"><i class="fa fa-pencil" aria-hidden="true"></i></a></li>
+													<li class="list-inline-item"><a href="#" aria-label="Remove"><i class="fa fa-times" aria-hidden="true"></i></a></li>
+												</ul>
+											</td>
+										</tr>
+										<tr role="row" class="tablesorter-hasChildRow table-sorter-top">
+											<td><a href="https://mottie.github.io/tablesorter/docs/example-child-rows.html#" class="toggle">3</a></td>
+											<td>What is the Capital of Pakistan?</td>
+											<td>
+												<ul class="list-inline">
+													<li class="list-inline-item"><span class="badge badge-primary">Multiple Choice</span></li>
+													<li class="list-inline-item"><span class="badge badge-primary">V.4</span></li>
+												</ul>
+											</td>
+											<td><input type="text" placeholder="1" value="1" aria-label="Points for question: 1" class="form-control"></td>
+											<td>
+												<ul class="list-inline tools">
+													<li class="list-inline-item"><a href="#" aria-label="Answer not required"><i class="fa fa-asterisk" aria-hidden="true"></i></a></li>
+													<li class="list-inline-item"><a href="#" aria-label="Edit"><i class="fa fa-pencil" aria-hidden="true"></i></a></li>
+													<li class="list-inline-item"><a href="#" aria-label="Remove"><i class="fa fa-times" aria-hidden="true"></i></a></li>
+												</ul>
+											</td>
+										</tr>
+									</tbody>
+								</table>
+								<ul class="list-inline bottom">
+									<li class="list-inline-item">
+										<select class="form-control form-control-select" aria-label="Options for gate">
+											<option>Multiple choice</option>
+											<option>Multiple choice</option>
+											<option>Multiple choice</option>
+										</select>
+									</li>
+									<li class="list-inline-item">
+										<button  aria-label="Add" class="btn btn-primary"><i class="fa fa-plus-circle" aria-hidden="true"></i></button>
+									</li>
+									<li class="list-inline-item">
+										<button class="btn btn-primary">Import QTI</button>
+									</li>
+								</ul>
+							</div>
+						</lams:Panel>
+						
+						<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="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="bbox-right bbox_body">
-	                                <div class="form-group">
-	                                    <label for="title">Title</label>
-	                                    <input type="text" id="title" placeholder="Title" class="form-control">
-	                                    <label for="instructions">Instructions</label>
-	                                    <textarea type="text" id="instructions" placeholder="Enter instructions" class="form-control"></textarea>
-	                                </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>
-						</div>
-	                
-						<div class="col-12 p-0">
-							<div class="bbox-col d-flex slide_col" id="bbox2">
-								<div class="bbox-left icon yellow">
-									<i class="fa fa-question-circle-o" aria-hidden="true"></i>
+								<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="bbox-right bbox_body">
-	                                <div class="grey_title grey_title1"><a tabindex="0" class="collapsible-link" data-toggle="collapse" href="#questionlist" data-target="#questionlist" role="button" aria-expanded="true" aria-controls="questionlist"><h2>Questions</h2></a>                                    
-									</div>
-									<div id="questionlist" class="collapse show" >
-										<table class="table table-bordered user-table-data tablesorter tablesorter-bootstrap tablesorterff73dd4148253 hasFilters tablesorter2fb3f6e97d426" role="grid">
-											<colgroup>
-												<col width="85">
-												<col width="900">
-												<col width="220">
-												<col width="100">
-												<col width="180">
-											</colgroup>
-											<thead>
-												<tr role="row" class="tablesorter-headerRow table-sorter-header">
-													<th data-column="0" class="tablesorter-header tablesorter-headerUnSorted" tabindex="0" scope="col" role="columnheader" aria-disabled="false" unselectable="on" aria-sort="none" aria-label="Order #: No sort applied, activate to apply an ascending sort" style="user-select: none;">
-														<div class="tablesorter-header-inner">#</div>
-													</th>
-													<th data-column="1" class="tablesorter-header tablesorter-headerUnSorted" tabindex="0" scope="col" role="columnheader" aria-disabled="false" unselectable="on" aria-sort="none" aria-label="Customer: No sort applied, activate to apply an ascending sort" style="user-select: none;">
-														<div class="tablesorter-header-inner">Question</div>
-													</th>
-													<th data-column="2" class="tablesorter-header tablesorter-headerUnSorted" tabindex="0" scope="col" role="columnheader" aria-disabled="false" unselectable="on" aria-sort="none" aria-label="PO: No sort applied, activate to apply an ascending sort" style="user-select: none;">
-														<div class="tablesorter-header-inner"></div>
-													</th>
-													<th data-column="3" class="tablesorter-header tablesorter-headerUnSorted" tabindex="0" scope="col" role="columnheader" aria-disabled="false" unselectable="on" aria-sort="none" aria-label="Date: No sort applied, activate to apply an ascending sort" style="user-select: none;">
-														<div class="tablesorter-header-inner">Mark</div>
-													</th>
-													<th data-column="4" class="tablesorter-header tablesorter-headerUnSorted" tabindex="0" scope="col" role="columnheader" aria-disabled="false" unselectable="on" aria-sort="none" aria-label="Total: No sort applied, activate to apply an ascending sort" style="user-select: none;">
-														<div class="tablesorter-header-inner"></div>
-													</th>
-												</tr>
-											</thead>
-											<tbody aria-live="polite" aria-relevant="all">
-												<tr role="row" class="tablesorter-hasChildRow table-sorter-top">
-													<td><a href="https://mottie.github.io/tablesorter/docs/example-child-rows.html#" class="toggle">1</a></td>
-													<td>What is the Capital of Botswana?</td>
-													<td>
-														<ul class="list-inline">
-															<li class="list-inline-item"><span class="badge badge-primary">Multiple Choice</span></li>
-															<li class="list-inline-item"><span class="badge badge-primary">V.4</span></li>
-														</ul>
-													</td>
-	                                                <td><input type="text" placeholder="1" value="1" aria-label="Points for question: 1" class="form-control"></td>
-													<td>
-														<ul class="list-inline tools">
-															<li class="list-inline-item"><a href="#" aria-label="Answer not required"><i class="fa fa-asterisk" aria-hidden="true"></i></a></li>
-															<li class="list-inline-item"><a href="#" aria-label="Edit"><i class="fa fa-pencil" aria-hidden="true"></i></a></li>
-															<li class="list-inline-item"><a href="#" aria-label="Remove"><i class="fa fa-times" aria-hidden="true"></i></a></li>
-														</ul>
-													</td>
-												</tr>
-												<tr role="row" class="tablesorter-hasChildRow table-sorter-top">
-													<td><a href="https://mottie.github.io/tablesorter/docs/example-child-rows.html#" class="toggle">2</a></td>
-													<td>What is the Capital of Poland?</td>
-													<td>
-														<ul class="list-inline">
-															<li class="list-inline-item"><span class="badge badge-primary">Multiple Choice</span></li>
-															<li class="list-inline-item"><span class="badge badge-primary">V.4</span></li>
-														</ul>
-													</td>
-													<td><input type="text" placeholder="1" value="1" aria-label="Points for question: 1" class="form-control"></td>
-													<td>
-														<ul class="list-inline tools">
-															<li class="list-inline-item"><a href="#" aria-label="Answer not required"><i class="fa fa-asterisk" aria-hidden="true"></i></a></li>
-															<li class="list-inline-item"><a href="#" aria-label="Edit"><i class="fa fa-pencil" aria-hidden="true"></i></a></li>
-															<li class="list-inline-item"><a href="#" aria-label="Remove"><i class="fa fa-times" aria-hidden="true"></i></a></li>
-														</ul>
-													</td>
-												</tr>
-												<tr role="row" class="tablesorter-hasChildRow table-sorter-top">
-													<td><a href="https://mottie.github.io/tablesorter/docs/example-child-rows.html#" class="toggle">3</a></td>
-													<td>What is the Capital of Pakistan?</td>
-													<td>
-														<ul class="list-inline">
-															<li class="list-inline-item"><span class="badge badge-primary">Multiple Choice</span></li>
-															<li class="list-inline-item"><span class="badge badge-primary">V.4</span></li>
-														</ul>
-													</td>
-													<td><input type="text" placeholder="1" value="1" aria-label="Points for question: 1" class="form-control"></td>
-													<td>
-														<ul class="list-inline tools">
-															<li class="list-inline-item"><a href="#" aria-label="Answer not required"><i class="fa fa-asterisk" aria-hidden="true"></i></a></li>
-															<li class="list-inline-item"><a href="#" aria-label="Edit"><i class="fa fa-pencil" aria-hidden="true"></i></a></li>
-															<li class="list-inline-item"><a href="#" aria-label="Remove"><i class="fa fa-times" aria-hidden="true"></i></a></li>
-														</ul>
-													</td>
-												</tr>
-											</tbody>
-										</table>
-										<ul class="list-inline bottom">
-											<li class="list-inline-item">
-												<select class="form-control form-control-select" aria-label="Options for gate">
-													<option>Multiple choice</option>
-													<option>Multiple choice</option>
-													<option>Multiple choice</option>
-												</select>
-											</li>
-											<li class="list-inline-item">
-												<button  aria-label="Add" class="btn btn-primary"><i class="fa fa-plus-circle" aria-hidden="true"></i></button>
-											</li>
-											<li class="list-inline-item">
-												<button class="btn btn-primary">Import QTI</button>
-											</li>
-										</ul>
-									</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>
 							</div>
-						</div>
-						
-	                    <div class="col-12 p-0">
-							<div class="bbox-col d-flex slide_col" id="bbox3">
-								<div class="bbox-left icon purple">
-									<i class="fa fa-gear" aria-hidden="true"></i>
+							<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>
-								<div class="bbox-right bbox_body">
-	                                <div class="grey_title grey_title1"><a class="collapsible-link" data-toggle="collapse" href="#assessmentoptions" data-target="#assessmentoptions" role="button" aria-expanded="false" aria-controls="assessmentoptions"><h2>Assessment Options</h2></a>
-									</div>
-									<div id="assessmentoptions" class="row mt-3 collapse">
-										<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="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="">
-	                                                    <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>
-										</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>
-											
-	                                        <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>
-											
-											
-											<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>
-											
-											<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>
-											
-											<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>
-										</div>
-									</div>
+								
+                                      <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>
+								
+								
+								<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>
+								
+								<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>
+								
+								<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>
 							</div>
-						</div>
+						</lams:Panel>
 						
-						<lams:Panel id="leaderselection" titleKey="label.select.leader" iconClass="fa-star-o" colorClass="yellow">
+						<lams:Panel id="leaderselection" titleKey="label.select.leader" iconClass="fa-star-o" colorClass="yellow" expanded="false">
 							<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>
@@ -422,367 +399,337 @@
 								</div>
 							</div>
 						</lams:Panel>
-		
-						<div class="col-12 p-0">
-							<div class="bbox-col d-flex slide_col" id="bbox5">
-								<div class="bbox-left icon purple">
-									<i class="fa fa-bell-o" aria-hidden="true"></i>
+						
+						<lams:Panel id="notifications" titleKey="label.notifications" iconClass="fa-bell-o" colorClass="purple" expanded="false">
+							<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="bbox-right bbox_body">
-	                                <div class="grey_title grey_title1"><a class="collapsible-link" data-toggle="collapse" href="#notifications" data-target="#notifications" role="button" aria-expanded="false" aria-controls="notifications"><h2>Notifications</h2></a> 
-									</div>
-									<div id="notifications" class="row mt-3 collapse">
-										<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>
-										</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>
-									</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>
 							</div>
-						</div>
-						<div class="col-12 p-0">
-							<div class="bbox-col d-flex slide_col" id="bbox6">
-								<div class="bbox-left icon blue">
-									<i class="fa fa-comment-o" aria-hidden="true"></i>
+							<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="bbox-right bbox_body">
-	                                <div class="grey_title grey_title1"><a class="collapsible-link" data-toggle="collapse" href="#overallfeedback" data-target="#overallfeedback" role="button" aria-expanded="false" aria-controls="overallfeedback"><h2>Overall feedback</h2></a> 
-									</div>
-									<div id="overallfeedback" class="row mt-3 collapse" >
-										<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>
-										</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>
-									</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>
-						</div>
-						<div class="col-12 p-0">
-							<div class="bbox-col d-flex slide_col" id="bbox7">
-								<div class="bbox-left icon green2">
-									<img src="<lams:LAMSURL/>images/components/assess-icon7.svg" alt="Learning Outcomes">
+						</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-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="bbox-right bbox_body">
-	                                <div class="grey_title grey_title1"><a class="collapsible-link" data-toggle="collapse" href="#learningoutcomes" data-target="#learningoutcomes" role="button" aria-expanded="false" aria-controls="learningoutcomes"><h2>Learning outcomes</h2></a>
-									</div>
-									<div id="learningoutcomes" class="row mt-3 collapse" >
-										<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>
-										</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>
-									</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>
 							</div>
-						</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-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>
+							</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>    
 			</form:form>