Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
===================================================================
diff -u -r8eefd9a2f57ce5b05eb75908e36bb042c5fe7fce -re7f6df71275535cf4af43f3ff4479a8c58e0be50
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision 8eefd9a2f57ce5b05eb75908e36bb042c5fe7fce)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision e7f6df71275535cf4af43f3ff4479a8c58e0be50)
@@ -545,10 +545,10 @@
      */
     @SuppressWarnings("unchecked")
     @RequestMapping(value = "/importQbQuestion", method = RequestMethod.POST)
-    private String importQbQuestion(HttpServletRequest request, @RequestParam Long qbQuestionUid) {
+    private String importQbQuestion(HttpServletRequest request, @RequestParam String sessionMapID,
+	    @RequestParam Long qbQuestionUid) {
 	//TODO perform updateQuestionReferencesMaxMarks prior to runnning this method
 	
-	String sessionMapID = WebUtil.readStrParam(request, AssessmentConstants.ATTR_SESSION_MAP_ID);
 	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
 		.getAttribute(sessionMapID);
 	QbQuestion qbQuestion = qbService.getQuestionByUid(qbQuestionUid);
Index: lams_tool_assessment/web/pages/authoring/basic.jsp
===================================================================
diff -u -r6cbd849584c40532c6be292f9f009c88cde9439c -re7f6df71275535cf4af43f3ff4479a8c58e0be50
--- lams_tool_assessment/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 6cbd849584c40532c6be292f9f009c88cde9439c)
+++ lams_tool_assessment/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision e7f6df71275535cf4af43f3ff4479a8c58e0be50)
@@ -27,13 +27,6 @@
 		
 		//load question bank div
 		$('#question-bank-collapse').on('show.bs.collapse', function () {
-			<c:url var="tempUrl" value="">
-				<c:param name="output">
-					<c:url value='/authoring/importQbQuestion.do'/>?sessionMapID=${sessionMapID}
-				</c:param>
-			</c:url>
-			<c:set var="returnUrl" value="${fn:substringAfter(tempUrl, '=')}" />
-
 			$('#question-bank-collapse.contains-nothing').load(
 				"<lams:LAMSURL/>/searchQB/start.do",
 				{
Index: lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r394f403c289f0fd7808c228840bead5c4e7d5d32 -re7f6df71275535cf4af43f3ff4479a8c58e0be50
--- lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 394f403c289f0fd7808c228840bead5c4e7d5d32)
+++ lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision e7f6df71275535cf4af43f3ff4479a8c58e0be50)
@@ -229,6 +229,6 @@
 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 224 labels for en AU =====
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
===================================================================
diff -u -rd709559abc2186520af2f18c3fc7417a5a598e9e -re7f6df71275535cf4af43f3ff4479a8c58e0be50
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision d709559abc2186520af2f18c3fc7417a5a598e9e)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision e7f6df71275535cf4af43f3ff4479a8c58e0be50)
@@ -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;
 
 /**
  * @author Andrey Balan
@@ -102,28 +103,23 @@
     }
 
     @RequestMapping("/definelater")
-    private String definelater(@ModelAttribute("authoringForm") ScratchieForm authoringForm, HttpServletRequest request)
-	    throws ServletException {
+    private String definelater(@ModelAttribute("authoringForm") ScratchieForm authoringForm, HttpServletRequest request,
+	    @RequestParam Long toolContentID) throws ServletException {
 	// update define later flag to true
-	Long contentId = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID));
-	Scratchie scratchie = scratchieService.getScratchieByContentId(contentId);
+	Scratchie scratchie = scratchieService.getScratchieByContentId(toolContentID);
 
 	scratchie.setDefineLater(true);
 	scratchieService.saveOrUpdateScratchie(scratchie);
 
 	//audit log the teacher has started editing activity in monitor
-	scratchieService.auditLogStartEditingActivityInMonitor(contentId);
+	scratchieService.auditLogStartEditingActivityInMonitor(toolContentID);
 
 	request.setAttribute(AttributeNames.ATTR_MODE, ToolAccessMode.TEACHER.toString());
 	return starting(authoringForm, request);
-
     }
 
     private String starting(@ModelAttribute("authoringForm") ScratchieForm authoringForm, HttpServletRequest request)
 	    throws ServletException {
-	List<ScratchieItem> items = null;
-	Scratchie scratchie = null;
-
 	// initial Session Map
 	SessionMap<String, Object> sessionMap = new SessionMap<>();
 	request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
@@ -138,6 +134,8 @@
 	Long contentId = new Long(WebUtil.readLongParam(request, ScratchieConstants.PARAM_TOOL_CONTENT_ID));
 	sessionMap.put(ScratchieConstants.PARAM_TOOL_CONTENT_ID, contentId);
 
+	List<ScratchieItem> items = null;
+	Scratchie scratchie = null;
 	try {
 	    scratchie = scratchieService.getScratchieByContentId(contentId);
 	    // if scratchie does not exist, try to use default content instead.
@@ -399,14 +397,14 @@
     /**
      * QB callback handler which adds selected QbQuestion into question list.
      */
+    @SuppressWarnings("unchecked")
     @RequestMapping(value = "/importQbQuestion", method = RequestMethod.POST)
-    private String importQbQuestion(HttpServletRequest request) {
-	String sessionMapID = WebUtil.readStrParam(request, ScratchieConstants.ATTR_SESSION_MAP_ID);
+    private String importQbQuestion(HttpServletRequest request, @RequestParam String sessionMapID,
+	    @RequestParam Long qbQuestionUid) {
 	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
 		.getAttribute(sessionMapID);
 	SortedSet<ScratchieItem> itemList = getItemList(sessionMap);
 	
-	Long qbQuestionUid = WebUtil.readLongParam(request, "qbQuestionUid");
 	QbQuestion qbQuestion = qbService.getQuestionByUid(qbQuestionUid);
 	
 	//create new ScratchieItem and assign imported qbQuestion to it
@@ -421,7 +419,6 @@
 	item.setQbQuestionModified(IQbService.QUESTION_MODIFIED_NONE);
 	itemList.add(item);
 
-
 	// evict everything manually as we do not use DTOs, just real entities
 	// without eviction changes would be saved immediately into DB
 //	scratchieService.releaseFromCache(item);
Index: lams_tool_scratchie/web/pages/authoring/authoring.jsp
===================================================================
diff -u -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 -re7f6df71275535cf4af43f3ff4479a8c58e0be50
--- lams_tool_scratchie/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
+++ lams_tool_scratchie/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision e7f6df71275535cf4af43f3ff4479a8c58e0be50)
@@ -16,24 +16,27 @@
 		#display-confidence-levels-activities {
 			margin-top: 8px;
 		}
+		#question-bank-div {
+    		margin-top: 75px;
+		}
 	</style>
 	
 	<script>
         function init(){
             var tag = document.getElementById("currentTab");
-		    	if (tag.value != "") {
-		    		selectTab(tag.value);
-		    	} else {
-	            selectTab(1); //select the default tab;
-		    	}
+		    if (tag.value != "") {
+		   		selectTab(tag.value);
+		   	} else {
+	       	    selectTab(1); //select the default tab;
+		    }
         }     
         
         function doSelectTab(tabId) {
-        		// start optional tab controller stuff
-        		var tag = document.getElementById("currentTab");
-	    		tag.value = tabId;
-	    		// end optional tab controller stuff
-	    		selectTab(tabId);	    	
+        	// start optional tab controller stuff
+        	var tag = document.getElementById("currentTab");
+	    	tag.value = tabId;
+	    	// end optional tab controller stuff
+	    	selectTab(tabId);	    	
         }
     </script>
  
Index: lams_tool_scratchie/web/pages/authoring/basic.jsp
===================================================================
diff -u -r14f09ab0c0d6351201073b5f1ffe6aec576508ee -re7f6df71275535cf4af43f3ff4479a8c58e0be50
--- lams_tool_scratchie/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 14f09ab0c0d6351201073b5f1ffe6aec576508ee)
+++ lams_tool_scratchie/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision e7f6df71275535cf4af43f3ff4479a8c58e0be50)
@@ -7,8 +7,24 @@
 
 <script lang="javascript">
 
-	var itemTargetDiv = "#itemArea";
+	$(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'/>?sessionMapID=${sessionMapID}",
+					toolContentId: ${sessionMap.toolContentID},
+					isFullJspRequested: false
+				},
+				function() {
+					$(this).removeClass("contains-nothing");
+				}
+			);
+		})
+	});
 
+	var itemTargetDiv = "#itemArea";
 	function removeItem(idx){
 		var	deletionConfirmed = confirm("<fmt:message key="warning.msg.authoring.do.you.want.to.delete"></fmt:message>");
 		
@@ -52,13 +68,6 @@
 			}
 		);
 	}
-
-	function createNewQuestionInitHref() {
-		var questionTypeDropdown = document.getElementById("questionType");
-		var questionType = questionTypeDropdown.selectedIndex + 1;
-		var newQuestionInitHref = "${newQuestionInitUrl}&questionType=" + questionType + "&referenceGrades=" + encodeURIComponent(serializeReferenceGrades()) + "&KeepThis=true&TB_iframe=true&modal=true";
-		$("#newQuestionInitHref").attr("href", newQuestionInitHref)
-	}
 	
 	function refreshThickbox(){
 		tb_init('a.thickbox, area.thickbox, input.thickbox');//pass where to apply thickbox
@@ -75,23 +84,35 @@
     <lams:CKEditor id="scratchie.instructions" value="${authoringForm.scratchie.instructions}" contentFolderID="${authoringForm.contentFolderID}"></lams:CKEditor>
 </div>
 
-<%-- <div id="resourceListArea">
-	<c:set var="sessionMapID" value="${authoringForm.sessionMapID}" />
- 	<%@ include file="/pages/authoring/parts/itemlist.jsp"%>
-</div>
- --%>
 <!-- Items -->
-<div>
-	<div  id="itemArea">
-		<%@ include file="parts/itemlist.jsp"%>
+<div  id="itemArea">
+	<%@ include file="parts/itemlist.jsp"%>
+</div>
+
+<div class="form-inline form-group pull-right" style="margin-top: -5px;">
+	<c:set var="addItemUrl" >
+		<c:url value='/authoring/addItem.do'/>?sessionMapID=${sessionMapID}&KeepThis=true&TB_iframe=true&modal=true
+	</c:set>
+	<a href="${addItemUrl}" class="btn btn-default btn-sm thickbox">
+		<i class="fa fa-lg fa-plus-circle" aria-hidden="true" title="<fmt:message key="label.authoring.basic.add.another.scratchie" />"></i>
+		&nbsp;
+		<fmt:message key="label.authoring.basic.add.another.scratchie" />
+	</a>
+</div>
+
+<!-- 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>
-		<c:set var="addItemUrl" >
-			<c:url value='/authoring/addItem.do'/>?sessionMapID=${sessionMapID}&KeepThis=true&TB_iframe=true&modal=true
-		</c:set>
-		<a href="${addItemUrl}" class="btn btn-default btn-sm thickbox">
-			<i class="fa fa-plus"></i>&nbsp;<fmt:message key="label.authoring.basic.add.another.scratchie" /> 
-		</a>
-	</div>
 </div>
+
Index: lams_tool_scratchie/web/pages/authoring/parts/itemlist.jsp
===================================================================
diff -u -r14f09ab0c0d6351201073b5f1ffe6aec576508ee -re7f6df71275535cf4af43f3ff4479a8c58e0be50
--- lams_tool_scratchie/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision 14f09ab0c0d6351201073b5f1ffe6aec576508ee)
+++ lams_tool_scratchie/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision e7f6df71275535cf4af43f3ff4479a8c58e0be50)
@@ -25,53 +25,44 @@
 <!-- Dropdown menu for choosing a question from question bank -->
 <div class="panel panel-default voffset20">
 	<div class="panel-heading panel-title">
-		<div class="roffset5 pull-right">
-			<c:url var="tempUrl" value="">
-				<c:param name="output">
-					<c:url value='/authoring/importQbQuestion.do'/>?sessionMapID=${sessionMapID}
-				</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 loffset5 thickbox"> 
-				Import from question bank
-			</a>
-		</div> 
-		
 		<fmt:message key="label.questions"/>
 	</div>
 	<input type="hidden" name="itemCount" id="itemCount" value="${fn:length(sessionMap.itemList)}">
 		
 	<table class="table table-condensed table-striped">
-			<c:forEach var="item" items="${sessionMap.itemList}" varStatus="status">
-				<tr>
-					<td style="padding-top:15px; padding-bottom:15px;">
-						<c:out value="${item.qbQuestion.name}" escapeXml="true"/>			
-					</td>
+		<c:forEach var="item" items="${sessionMap.itemList}" varStatus="status">
+			<tr>
+				<td style="padding-top:15px; padding-bottom:15px;">
+					<c:out value="${item.qbQuestion.name}" escapeXml="true"/>
+					
+				    <span class='pull-right alert-info btn-xs loffset5 roffset5'>
+				    	v.&nbsp;${item.qbQuestion.version}
+				    </span>		
+				</td>
 						
-					<td class="arrows" style="width:5%">
-						<c:if test="${not status.first}">
-							<lams:Arrow state="up" title="<fmt:message key='label.authoring.basic.up'/>" onclick="return upItem(${status.index})"/>
-						</c:if>
+				<td class="arrows" style="width:5%">
+					<c:if test="${not status.first}">
+						<lams:Arrow state="up" title="<fmt:message key='label.authoring.basic.up'/>" onclick="return upItem(${status.index})"/>
+					</c:if>
 		
-						<c:if test="${not status.last}">
-							<lams:Arrow state="down" title="<fmt:message key='label.authoring.basic.down'/>" onclick="return downItem(${status.index})"/>
-						</c:if>
-					</td>
+					<c:if test="${not status.last}">
+						<lams:Arrow state="down" title="<fmt:message key='label.authoring.basic.down'/>" onclick="return downItem(${status.index})"/>
+					</c:if>
+				</td>
 					
-					<td align="center" style="width:5%">
-						<c:set var="editItemUrl" >
-							<c:url value='/authoring/editItem.do'/>?sessionMapID=${sessionMapID}&itemIndex=${status.index}&KeepThis=true&TB_iframe=true&modal=true
-						</c:set>		
-						<a href="${editItemUrl}" class="thickbox"> 
-							<i class="fa fa-pencil"	title="<fmt:message key='label.edit' />"/></i>
-						</a>
-					</td>			
+				<td align="center" style="width:5%">
+					<c:set var="editItemUrl" >
+						<c:url value='/authoring/editItem.do'/>?sessionMapID=${sessionMapID}&itemIndex=${status.index}&KeepThis=true&TB_iframe=true&modal=true
+					</c:set>		
+					<a href="${editItemUrl}" class="thickbox"> 
+						<i class="fa fa-pencil"	title="<fmt:message key='label.edit' />"/></i>
+					</a>
+				</td>			
 					
-					<td  align="center" style="width:5%"><i class="fa fa-times"	title="<fmt:message key="label.delete" />" id="delete${status.index}" 
-							onclick="removeItem(${status.index})"></i>
-					</td>
-				</tr>
-			</c:forEach>
+				<td  align="center" style="width:5%"><i class="fa fa-times"	title="<fmt:message key="label.delete" />" id="delete${status.index}" 
+						onclick="removeItem(${status.index})"></i>
+				</td>
+			</tr>
+		</c:forEach>
 	</table>
 </div>