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