Index: lams_central/web/authoring/template/comms.jsp
===================================================================
diff -u -r8be457696d7f17c6da2e89704fe7e128f1f8ea91 -r9f75aff30e9b0b3941d5c719a840b17ad8a7364a
--- lams_central/web/authoring/template/comms.jsp	(.../comms.jsp)	(revision 8be457696d7f17c6da2e89704fe7e128f1f8ea91)
+++ lams_central/web/authoring/template/comms.jsp	(.../comms.jsp)	(revision 9f75aff30e9b0b3941d5c719a840b17ad8a7364a)
@@ -141,7 +141,7 @@
 	    	window.open(url,'QuestionFile','width=500,height=240,scrollbars=yes,top=150,left=' + left);
 	    }
 
-		function createAssessment(questionType, numAssessmentsFieldname, containingDivName, qbQuestionUid) {
+		function createAssessment(questionType, numAssessmentsFieldname, containingDivName, qbQuestionUid, collapse) {
 			var numAssessments = $('#'+numAssessmentsFieldname);
 			var type = questionType ? questionType : 'essay';
 			var currNum = numAssessments.val();
@@ -161,12 +161,16 @@
 					newDiv.remove();
 				} else {
 					numAssessments.val(nextNum);
-					newDiv.scrollIntoView();
+					if (collapse) {
+						$('.collapse', newDiv).collapse('hide');
+					} else {
+						newDiv.scrollIntoView();
+					}
 				}
 			});
 		}		
 		
-		function createQuestion(numQuestionsFieldname, newDivPrefix, questionDivName, forward, extraParam) {
+		function createQuestion(numQuestionsFieldname, newDivPrefix, questionDivName, forward, extraParam, collapse) {
 			var numQuestions = $('#'+numQuestionsFieldname);
 			var currNum = numQuestions.val();
 			var nextNum = +currNum + 1;
@@ -187,8 +191,12 @@
 					newDiv.remove();
 				} else {
 					numQuestions.val(nextNum);
-					newDiv.focus();
-					newDiv.scrollIntoView();
+					if (collapse) {
+						$('.collapse', newDiv).collapse('hide');
+					} else {
+						newDiv.focus();
+						newDiv.scrollIntoView();
+					}
 				}
 			});
 		}		
Index: lams_central/web/authoring/template/tbl/appex.jsp
===================================================================
diff -u -rc5f1c588cb57eb6b7c14d1ad679d6c2c1925b319 -r9f75aff30e9b0b3941d5c719a840b17ad8a7364a
--- lams_central/web/authoring/template/tbl/appex.jsp	(.../appex.jsp)	(revision c5f1c588cb57eb6b7c14d1ad679d6c2c1925b319)
+++ lams_central/web/authoring/template/tbl/appex.jsp	(.../appex.jsp)	(revision 9f75aff30e9b0b3941d5c719a840b17ad8a7364a)
@@ -46,7 +46,7 @@
 			</div>
 			
 			<!-- Question Bank for this Application Excercise -->
-			<div class="panel-group question-bank-div" id="question-bank-ae-div-${appexNumber}" role="tablist" aria-multiselectable="true"> 
+			<div class="panel-group question-bank-div space-sides" id="question-bank-ae-div-${appexNumber}" role="tablist" aria-multiselectable="true"> 
 			    <div class="panel panel-default">
 			        <div class="panel-heading collapsable-icon-left" id="question-bank-ae-heading-${appexNumber}">
 			        	<span class="panel-title">
Index: lams_central/web/authoring/template/tbl/tbl.jsp
===================================================================
diff -u -rc5f1c588cb57eb6b7c14d1ad679d6c2c1925b319 -r9f75aff30e9b0b3941d5c719a840b17ad8a7364a
--- lams_central/web/authoring/template/tbl/tbl.jsp	(.../tbl.jsp)	(revision c5f1c588cb57eb6b7c14d1ad679d6c2c1925b319)
+++ lams_central/web/authoring/template/tbl/tbl.jsp	(.../tbl.jsp)	(revision 9f75aff30e9b0b3941d5c719a840b17ad8a7364a)
@@ -174,16 +174,10 @@
 			// extract the ID
 			var qbQuestionUid = +$("#itemArea").text();
 			if (qbQuestionAddAppexNumber) {
-				createAssessment('importQbAe', 'numAssessments' + qbQuestionAddAppexNumber, 'divass' + qbQuestionAddAppexNumber, qbQuestionUid);
-				$('#question-bank-ae-div-' + qbQuestionAddAppexNumber).slideUp(function(){
-					$('.panel-collapse', this).empty();
-				});
+				createAssessment('importQbAe', 'numAssessments' + qbQuestionAddAppexNumber, 'divass' + qbQuestionAddAppexNumber, qbQuestionUid, true);
 			} else {
 				// fetch HTML with filled data from QB question
-				createQuestion('numQuestions', 'divq', 'divquestions', 'importQbIra', '&qbQuestionUid=' + qbQuestionUid);
-				$('#question-bank-ira-div').slideUp(function(){
-					$('.panel-collapse', this).empty();
-				});
+				createQuestion('numQuestions', 'divq', 'divquestions', 'importQbIra', '&qbQuestionUid=' + qbQuestionUid, true);
 			}
 		};
 
Index: lams_central/web/authoring/template/tool/assessmcq.jsp
===================================================================
diff -u -re6dc4db4137cfd6b07a4aa79711b9d12b39fb78e -r9f75aff30e9b0b3941d5c719a840b17ad8a7364a
--- lams_central/web/authoring/template/tool/assessmcq.jsp	(.../assessmcq.jsp)	(revision e6dc4db4137cfd6b07a4aa79711b9d12b39fb78e)
+++ lams_central/web/authoring/template/tool/assessmcq.jsp	(.../assessmcq.jsp)	(revision 9f75aff30e9b0b3941d5c719a840b17ad8a7364a)
@@ -16,16 +16,20 @@
 <c:set var="questionTitleField">${containingDivName}assessment${questionNumber}title</c:set>
 
 <div class="panel panel-default">
-	<div class="panel-heading">
-		<div class="panel-title">		
+	<div class="panel-heading" id="${containingDivName}assessmentQuestionPanelHeading${questionNumber}">
+		<div class="panel-title collapsable-icon-left">
+			<a role="button" data-toggle="collapse" href="#${containingDivName}assessmentQuestionPanelCollapse${questionNumber}" 
+				aria-expanded="true" aria-controls="${containingDivName}assessmentQuestionPanelCollapse${questionNumber}" >&nbsp;&nbsp;
+		  	</a>			
 		${questionNumber eq 1 ? "<label class=\"required\">" : ""}
 			<span class="hoverEdit" name="${questionTitleDisplay}" id="${questionTitleDisplay}" ><c:out value="${questionTitle}" /></span><span>&nbsp;</span><i class='fa fa-sm fa-pencil'></i>
 		${questionNumber eq 1 ? "</label>" : ""}
 			<input name="${questionTitleField}" id="${questionTitleField}" type="hidden" value="${questionTitle}"/>
 		</div>
 	</div>
 
-	<div class="panel-body">	
+	<div class="panel-body panel-collapse collapse in" id="${containingDivName}assessmentQuestionPanelCollapse${questionNumber}"
+		 role="tabpanel" aria-labelledby="${containingDivName}assessmentQuestionPanelHeading${questionNumber}">	
 
 	<input type="hidden" name="${containingDivName}assessment${questionNumber}uuid" value="${question.uuid}"/>
 	<input type="hidden" name="${containingDivName}assessment${questionNumber}type" id="${containingDivName}assessment${questionNumber}type" value="mcq"/>
Index: lams_central/web/authoring/template/tool/assessment.jsp
===================================================================
diff -u -re6dc4db4137cfd6b07a4aa79711b9d12b39fb78e -r9f75aff30e9b0b3941d5c719a840b17ad8a7364a
--- lams_central/web/authoring/template/tool/assessment.jsp	(.../assessment.jsp)	(revision e6dc4db4137cfd6b07a4aa79711b9d12b39fb78e)
+++ lams_central/web/authoring/template/tool/assessment.jsp	(.../assessment.jsp)	(revision 9f75aff30e9b0b3941d5c719a840b17ad8a7364a)
@@ -12,16 +12,20 @@
 <c:set var="questionTitleField">${containingDivName}assessment${questionNumber}title</c:set>
 
 <div class="panel panel-default">
-	<div class="panel-heading">
-		<div class="panel-title">		
+	<div class="panel-heading" id="${containingDivName}assessmentQuestionPanelHeading${questionNumber}">
+		<div class="panel-title collapsable-icon-left">
+			<a role="button" data-toggle="collapse" href="#${containingDivName}assessmentQuestionPanelCollapse${questionNumber}" 
+				aria-expanded="true" aria-controls="${containingDivName}assessmentQuestionPanelCollapse${questionNumber}" >&nbsp;&nbsp;
+		  	</a>	
 		${questionNumber eq 1 ? "<label class=\"required\">" : ""}
 			<span class="hoverEdit" name="${questionTitleDisplay}" id="${questionTitleDisplay}" ><c:out value="${questionTitle}" /></span><span>&nbsp;</span><i class='fa fa-sm fa-pencil'></i>
 		${questionNumber eq 1 ? "</label>" : ""}
 			<input name="${questionTitleField}" id="${questionTitleField}" type="hidden" value="${questionTitle}"/>
 		</div>
 	</div>
 
-	<div class="panel-body">	
+	<div class="panel-body panel-collapse collapse in" id="${containingDivName}assessmentQuestionPanelCollapse${questionNumber}"
+		 role="tabpanel" aria-labelledby="${containingDivName}assessmentQuestionPanelHeading${questionNumber}">	
 	
 	<input type="hidden" name="${containingDivName}assessment${questionNumber}uuid" value="${question.uuid}"/>