Index: lams_tool_laqa/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r298ac30bd04d6cdffdbbc42d1ceec29831809dc7 -ra7690b14578fa656e8782755c2f45b9ee7aa00db
--- lams_tool_laqa/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 298ac30bd04d6cdffdbbc42d1ceec29831809dc7)
+++ lams_tool_laqa/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision a7690b14578fa656e8782755c2f45b9ee7aa00db)
@@ -224,6 +224,7 @@
 outcome.authoring.existing  =Added outcomes
 outcome.authoring.existing.none  =none
 outcome.authoring.remove.confirm  =Are you sure you want to remove this learning outcome?
+label.question.bank  =Question bank
 
 
 #======= End labels: Exported 217 labels for en AU =====
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaAuthoringController.java
===================================================================
diff -u -r0b1e74374b821758fdda7835d8d283bf84fa8db0 -ra7690b14578fa656e8782755c2f45b9ee7aa00db
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaAuthoringController.java	(.../QaAuthoringController.java)	(revision 0b1e74374b821758fdda7835d8d283bf84fa8db0)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaAuthoringController.java	(.../QaAuthoringController.java)	(revision a7690b14578fa656e8782755c2f45b9ee7aa00db)
@@ -72,6 +72,7 @@
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
 
 /**
  * Q&A Tool's authoring methods. Additionally, there is one more method that initializes authoring and it's located in
@@ -193,7 +194,7 @@
 	sessionMap.put(QaAppConstants.ACTIVITY_TITLE_KEY, qaContent.getTitle());
 	sessionMap.put(QaAppConstants.ACTIVITY_INSTRUCTIONS_KEY, qaContent.getInstructions());
 
-	List<QaQuestionDTO> questionDTOs = new LinkedList();
+	List<QaQuestionDTO> questionDTOs = new LinkedList<>();
 
 	/*
 	 * get the existing question content
@@ -603,13 +604,11 @@
     @SuppressWarnings("unchecked")
     @RequestMapping(value = "/importQbQuestion", method = RequestMethod.POST)
     private String importQbQuestion(@ModelAttribute("newQuestionForm") QaAuthoringForm authoringForm,
-	    HttpServletRequest request) {
-	String httpSessionID = WebUtil.readStrParam(request, "httpSessionID");
+	    HttpServletRequest request, @RequestParam String httpSessionID, @RequestParam Long qbQuestionUid) {
 	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
 		.getAttribute(httpSessionID);
 	
 	//get QbQuestion from DB
-	Long qbQuestionUid = WebUtil.readLongParam(request, "qbQuestionUid");
 	QbQuestion qbQuestion = qbService.getQuestionByUid(qbQuestionUid);
 
 	List<QaQuestionDTO> questionDTOs = (List<QaQuestionDTO>) sessionMap.get(QaAppConstants.LIST_QUESTION_DTOS);
Index: lams_tool_laqa/web/authoring/BasicContent.jsp
===================================================================
diff -u -r72c9800d4076fa450caff0943dd4de41399c83e0 -ra7690b14578fa656e8782755c2f45b9ee7aa00db
--- lams_tool_laqa/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision 72c9800d4076fa450caff0943dd4de41399c83e0)
+++ lams_tool_laqa/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision a7690b14578fa656e8782755c2f45b9ee7aa00db)
@@ -1,21 +1,50 @@
 <%@ include file="/common/taglibs.jsp"%>
+<c:set var="httpSessionID" value="${authoringForm.httpSessionID}" />
+<c:set var="sessionMap" value="${sessionScope[httpSessionID]}" />
 
+<style>
+	#question-bank-div {
+    	margin-top: 75px;
+	}
+	#add-question-div {
+		margin-top: -5px;
+	}
+	#messageArea {
+		margin-top: 60px;
+	}
+</style>
+
 <script type="text/javascript">
-<!-- Common Javascript functions for LAMS -->
+	$(document).ready(function(){
+		//question bank div
+		$('#question-bank-collapse').on('show.bs.collapse', function () {
+			$('#question-bank-collapse.contains-nothing').load(
+				"<lams:LAMSURL/>/searchQB/start.do",
+				{
+					returnUrl: "<c:url value='/authoring/importQbQuestion.do'/>?httpSessionID=${authoringForm.httpSessionID}",
+					toolContentId: ${sessionMap.toolContentID}
+				},
+				function() {
+					$(this).removeClass("contains-nothing");
+				}
+			);
+		})
+	});
+
 	/**
 	 * Launches the popup window for the instruction files
 	 */
 	function showMessage(url) {
 		 $.ajaxSetup({ cache: true });
 		 $("#messageArea").load(url, function() {
-			 $(this).show();
-			 $('#saveCancelButtons').hide();
+			 $(this).show("fast");
+			 $('#saveCancelButtons, #question-bank-div, #addTopic').hide();
 		 });
 		location.hash = "messageArea";
 	}
 	function hideMessage(){
 		 $("#messageArea").hide();
-		 $('#saveCancelButtons').show();
+		 $('#saveCancelButtons, #question-bank-div, #addTopic').show();
 	}
 	
 	function removeQuestion(questionIndex){
@@ -54,20 +83,35 @@
 </div>
 <div class="form-group">
     <label for="instructions"><fmt:message key="label.authoring.instructions.col" /></label>
-    <lams:CKEditor id="instructions" value="${authoringForm.instructions}"
-    			   contentFolderID="${authoringForm.contentFolderID}">
+    <lams:CKEditor id="instructions" value="${authoringForm.instructions}" contentFolderID="${authoringForm.contentFolderID}">
     </lams:CKEditor>
 </div>
 
-
 <div id="itemArea">
 	<%@ include file="/authoring/itemlist.jsp"%>
 </div>
 
-<div class="form-inline">
-	<a href="javascript:showMessage('<lams:WebAppURL/>authoring/newQuestionBox.do?contentFolderID=${authoringForm.contentFolderID}&httpSessionID=${authoringForm.httpSessionID}&toolContentID=${authoringForm.toolContentID}&usernameVisible=${authoringForm.usernameVisible}&showOtherAnswers=${authoringForm.showOtherAnswers}&lockWhenFinished=${authoringForm.lockWhenFinished}&questionsSequenced=${authoringForm.questionsSequenced}');"
-		id="addTopic" class="btn btn-default btn-sm"><i class="fa fa-plus"></i>&nbsp;<fmt:message key="label.add.new.question" /> 
+<div id="add-question-div" class="form-inline form-group pull-right">
+	<a href="javascript:showMessage('<lams:WebAppURL/>authoring/newQuestionBox.do?contentFolderID=${authoringForm.contentFolderID}&httpSessionID=${authoringForm.httpSessionID}&toolContentID=${sessionMap.toolContentID}&usernameVisible=${authoringForm.usernameVisible}&showOtherAnswers=${authoringForm.showOtherAnswers}&lockWhenFinished=${authoringForm.lockWhenFinished}&questionsSequenced=${authoringForm.questionsSequenced}');"
+		id="addTopic" class="btn btn-default btn-sm">
+		<i class="fa fa-lg fa-plus-circle"></i>&nbsp;<fmt:message key="label.add.new.question" /> 
 	</a>
 </div>
 
-<div id="messageArea" class="voffset10"></div>
\ No newline at end of file
+<!-- Question Bank -->
+<div class="panel-group" id="question-bank-div" role="tablist" aria-multiselectable="true"> 
+    <div class="panel panel-default" >
+        <div class="panel-heading collapsable-icon-left" id="question-bank-heading">
+        	<span class="panel-title">
+		    	<a class="collapsed" role="button" data-toggle="collapse" href="#question-bank-collapse" aria-expanded="false" aria-controls="question-bank-collapse" >
+	          		<fmt:message key="label.question.bank" />
+	        	</a>
+      		</span>
+        </div>
+	
+		<div id="question-bank-collapse" class="panel-body panel-collapse collapse contains-nothing" role="tabpanel" aria-labelledby="question-bank-heading">
+		</div>
+	</div>
+</div>
+
+<div id="messageArea"></div>
\ No newline at end of file
Index: lams_tool_laqa/web/authoring/itemlist.jsp
===================================================================
diff -u -r72c9800d4076fa450caff0943dd4de41399c83e0 -ra7690b14578fa656e8782755c2f45b9ee7aa00db
--- lams_tool_laqa/web/authoring/itemlist.jsp	(.../itemlist.jsp)	(revision 72c9800d4076fa450caff0943dd4de41399c83e0)
+++ lams_tool_laqa/web/authoring/itemlist.jsp	(.../itemlist.jsp)	(revision a7690b14578fa656e8782755c2f45b9ee7aa00db)
@@ -1,26 +1,11 @@
 <%@ include file="/common/taglibs.jsp"%>
 <c:set var="httpSessionID" value="${authoringForm.httpSessionID}" />
-<c:set var="sessionMap" value="${sessionScope[httpSessionID]}" />
 
 <div id="itemList">
 	<div class="panel panel-default add-file">
 	
 	<div class="panel-heading panel-title">
 		<fmt:message key="label.questions" />
-		
-		<div class="pull-right">
-			<c:url var="tempUrl" value="">
-				<c:param name="output">
-					<c:url value='/authoring/importQbQuestion.do'/>?httpSessionID=${httpSessionID}
-				</c:param>
-			</c:url>
-			<c:set var="returnUrl" value="${fn:substringAfter(tempUrl, '=')}" />
-		
-			<a href="<lams:LAMSURL/>/searchQB/start.do?returnUrl=${returnUrl}&toolContentId=${sessionMap.toolContentID}&KeepThis=true&TB_iframe=true&modal=true" 
-				class="btn btn-default btn-xs thickbox"> 
-				Import from question bank
-			</a>
-		</div> 
 	</div>
 
 	<table class="table table-striped table-condensed">
@@ -29,6 +14,7 @@
 				<td>
 					<c:out value="${currentDTO.question}" escapeXml="false" />
 				</td>
+				
 				<td class="arrows" style="width:5%">
 					<!-- Don't display up icon if first line -->
 					<c:if test="${not status.first}">
@@ -41,6 +27,7 @@
 									onclick="javascript:submitModifyAuthoringQuestion(${status.count},'moveQuestionDown') "/>
 		 			</c:if>
 				</td>
+				
 				<td align="center" style="width:5%"><i class="fa fa-pencil"	title="<fmt:message key="label.tip.editQuestion" />"
 					onclick="javascript:showMessage('<lams:WebAppURL/>authoring/newEditableQuestionBox.do?questionIndex=${status.count}&contentFolderID=${authoringForm.contentFolderID}&httpSessionID=${httpSessionID}&toolContentID=${authoringForm.toolContentID}')"></i>
 				</td>
Index: lams_tool_laqa/web/authoring/newQuestionBox.jsp
===================================================================
diff -u -rb7b682644cd1d20e061092b1411eeb679a1f9fb2 -ra7690b14578fa656e8782755c2f45b9ee7aa00db
--- lams_tool_laqa/web/authoring/newQuestionBox.jsp	(.../newQuestionBox.jsp)	(revision b7b682644cd1d20e061092b1411eeb679a1f9fb2)
+++ lams_tool_laqa/web/authoring/newQuestionBox.jsp	(.../newQuestionBox.jsp)	(revision a7690b14578fa656e8782755c2f45b9ee7aa00db)
@@ -39,8 +39,11 @@
 	</div>
 </div>	
 	<div class="voffset5 pull-right">
-		<a href="#" onclick="hideMessage()" class="btn btn-default btn-xs loffset5"> <fmt:message key="label.cancel" /> </a>
-		<a href="#" onclick="submitMessage()" class="btn btn-default btn-xs"> <fmt:message key="label.save.question" /></a>
+		<a href="#" onclick="hideMessage()" class="btn btn-default btn-sm loffset5"> <fmt:message key="label.cancel" /> </a>
+		<a href="#" onclick="submitMessage()" class="btn btn-default btn-sm"> 
+			<i class="fa fa-lg fa-plus-circle"></i>
+			<fmt:message key="label.save.question" />
+		</a>
 	</div>
 </form:form>
 </div>