Index: lams_central/src/java/org/lamsfoundation/lams/web/qb/SearchQBController.java
===================================================================
diff -u -r8eefd9a2f57ce5b05eb75908e36bb042c5fe7fce -rd064905749470c0f9d9ffd8b7d8614529d533a88
--- lams_central/src/java/org/lamsfoundation/lams/web/qb/SearchQBController.java	(.../SearchQBController.java)	(revision 8eefd9a2f57ce5b05eb75908e36bb042c5fe7fce)
+++ lams_central/src/java/org/lamsfoundation/lams/web/qb/SearchQBController.java	(.../SearchQBController.java)	(revision d064905749470c0f9d9ffd8b7d8614529d533a88)
@@ -121,12 +121,7 @@
 	request.setAttribute("questionType", questionTypeDefault);
 	request.setAttribute("questionTypesAvailable", questionTypesAvailable.toString());
 	
-	boolean isFullJspRequested = WebUtil.readBooleanParam(request, "isFullJspRequested", true);
-	if (isFullJspRequested) {
-	    return "qb/search";    
-	} else {
-	    return "qb/searchWidget";
-	}
+	return "qb/search";
     }
     
     /**
Index: lams_central/web/qb/search.jsp
===================================================================
diff -u -r6cbd849584c40532c6be292f9f009c88cde9439c -rd064905749470c0f9d9ffd8b7d8614529d533a88
--- lams_central/web/qb/search.jsp	(.../search.jsp)	(revision 6cbd849584c40532c6be292f9f009c88cde9439c)
+++ lams_central/web/qb/search.jsp	(.../search.jsp)	(revision d064905749470c0f9d9ffd8b7d8614529d533a88)
@@ -4,68 +4,252 @@
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-core" prefix="c"%>
 
-<lams:html>
-<lams:head>
-	<title>Question Bank Search</title>
+<link type="text/css" href="<lams:LAMSURL/>css/free.ui.jqgrid.min.css" rel="stylesheet">
+<link type="text/css" href="<lams:LAMSURL />gradebook/includes/css/gradebook.css" rel="stylesheet" />
 	
-	<lams:css />
-	
-	<style>
-		#close-button .fa {
-		    font-size: 16px;
-		    vertical-align: super;
-		}
-		#main-panel {
-			border: none; 
-			box-shadow: none;
-		}
+<style>
+	#grid-holder {
+	    padding-top: 15px;
+	}
+	.question-description-grid {
+		min-height: 10px;
+		max-height: 12px;
+   		overflow-x: hidden;
+   		margin-top: 4px;
+	}
+	.question-title-grid {
+	    overflow-x: hidden;
+	}
+
+	#import-button {
+		margin-left: 5px;
+	}
+	#search-widgets {
+		display: flex;
+		margin-bottom: 15px;
+	}
+	#search-widgets .form-control {
+		width: auto;
+	}
 		
-		/*----------STICKY FOOTER----------------*/
-		html {
-		    position: relative;
-		    min-height: 100%;
+	.question-description {
+		font-size: smaller;
+	}
+		
+	/* jqGrid padding */
+	.ui-jqgrid.ui-jqgrid-bootstrap tr.jqgrow>td {
+		padding: 10px;
+	}
+		
+	#grid-container {
+		min-height: 300px;
+	}
+		
+	/* padding of #grid-container's two columns */
+	#grid-container > div {
+		padding: 0;
+	}
+	@media (min-width: 768px){
+		#question-detail-area {
+		    padding-left: 20px !important;
 		}
-		body {
-			margin-bottom: 44px;
+	}
+	@media (max-width: 768px){
+		#question-detail-area {
+		    margin-top: 20px !important;
 		}
-		footer {
-			position: absolute;
-		    bottom: 0;
-		    width: 100%;
-		    height: 44px;
-		}
-		footer > div {
-			height: 44px;
-		}
-	</style>
+	}
+		
+	#question-detail-area table {
+	    margin-top: 15px;
+	}
+		
+	/* hide "View 1 out of 10" label */
+	#questions-grid-pager_left, #questions-grid-pager_right {
+		display: none;
+	}
+		
+	.highlight {
+	    background-color: #FFFF88;
+	}
+		
+	.disabled-span {
+		-moz-user-select: none; -webkit-user-select: none; -ms-user-select:none; user-select:none;-o-user-select:none;
+	}
+		
+	.dropdown-menu {
+	    min-width: 90px;
+	}
+		
+	/* jqGrid header */
+	.ui-jqgrid .ui-jqgrid-htable .ui-jqgrid-labels th div {
+	    font-size: 14px;
+   		margin: 6px;
+	}
+		
+	/* question imported growl */
+	div.growlUI h1, div.growlUI h2 {
+		color: white;
+		margin: 5px 5px 5px 0px;
+		text-align: center;
+		font-size: 18px;
+	}
+		
+	#question-type {
+		display: inline-flex;
+	}
+</style>
 
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"></script>
-</lams:head>
-<body>
-	<div id="main-panel" class="panel panel-default">
-		<div class="panel-heading panel-title">
-			<fmt:message key="label.search.question.bank"/>
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/free.jquery.jqgrid.min.js"></script>
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.highlight.js"></script>
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.blockUI.js"></script>
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/qb-search.js"></script>
+<script type="text/javascript">
+	$(document).ready(function(){
 			
-			<button type="button" id="close-button" class="close" data-dismiss="modal" aria-label="Close"
-				onclick="javascript:self.parent.tb_remove();">
-				<i class="fa fa-times" aria-hidden="true"></i>
-			</button>
+		jQuery("#questions-grid").jqGrid({
+		   	multiselect: false,
+			datatype: "json",
+			url: "<c:url value="/searchQB/getPagedQuestions.do"/>",
+			postData: { 
+           		questionType: ${questionType} 
+	        },
+			height: '100%',
+			autowidth: true,
+			shrinkToFit: true,
+		    pager: 'questions-grid-pager',
+		    rowList:[10,20,30,40,50,100],
+		    rowNum:10,
+		    guiStyle: "bootstrap",
+			iconSet: 'fontAwesome',
+		   	colNames:[
+			   	'questionUid',
+				'<fmt:message key="authoring.section.questions"/>',
+				'questionDescription'
+			],
+		   	colModel:[
+		   		{name:'questionUid', index:'questionUid', width:0, hidden: true},
+		   		{name:'questionName', index:'questionName', width:570, search: true, searchoptions: { clearSearch: false }, formatter:questionNameFormatter},
+		   		{name:'questionDescription', index:'questionDescription', width:0, hidden: true}
+		   	],
+			onSelectRow: function(rowid, e) {
+			    //load up question details area
+		   		var questionUid = jQuery("#questions-grid").getCell(rowid, 'questionUid');
+		   		loadQuestionDetailsArea(questionUid);
+			},
+	  	  	gridComplete: gridSearchHighlight,
+		    loadError: function(xhr,textStatus,errorThrown) {
+		    	$("#questions-grid").clearGridData();
+		    	$("#question-detail-area").hide().html("");
+
+		    	//display warning message
+		    	$(this).jqGrid("displayErrorMessage", "<fmt:message key="error.loaderror"/>");
+		    }
+		})
+		.navGrid("#questions-grid-pager", {edit:false,add:false,del:false,search:false});	
+
+        //jqgrid autowidth
+        $(window).bind('resize', function() {
+            resizeJqgrid($(".ui-jqgrid-btable:visible"));
+        });
+    	function resizeJqgrid(jqgrids) {
+    		jqgrids.each(function(index) {
+    			var gridId = $(this).attr('id');
+    	    	var gridParentWidth = jQuery('#gbox_' + gridId).parent().width();
+    	    	jQuery('#' + gridId).setGridWidth(gridParentWidth, true);
+    	    });
+    	};
+
+    	//handler for "Import" button
+    	$(document).on("click", '#import-button', function() {
+    		//don't import if button is disabled 
+    		if ($(this).is('[disabled=disabled]')) {
+    			return;
+	    	}
+	    	//disabling the button
+    		$(this).attr("disabled", "disabled");
+		    	
+	    	$("#itemArea").load(
+				"${param.returnUrl}",
+				{
+					qbQuestionUid: $("#selected-question-uid").val()
+				},
+				function() {
+					//invoke refreshThickbox() only in case parent page has this method 
+					if (typeof refreshThickbox === "function") {
+						refreshThickbox();
+					}
+
+					//show successfull notification
+                	$.growlUI('<i class="fa fa-lg fa-download"></i> <fmt:message key="label.question.successfully.imported" />');
+				}
+			);
+        });
+	});
+
+	//load up question details area
+    function loadQuestionDetailsArea(questionUid) {
+        $("#question-detail-area").show().load(
+  	       	'<c:url value="/searchQB/displayQuestionDetails.do"/>',
+  	       	{
+  	       		questionUid: questionUid
+  	    	},
+  	    	function() {
+  	    	}
+  	    );
+	}
+</script>
+
+<div id="search-widgets" class="input-group-sm">
+	<input type="text" id="filter-questions" class="form-control" placeholder="Contains text" 
+		onkeydown="doSearch(arguments[0]||event)" />
+		
+	<c:if test="${!empty questionTypesAvailable}">
+		<div class="loffset10 input-group-sm">
+			<fmt:message key="label.question.type" />
+			<select id="question-type" onchange="gridSearch();" class="form-control">
+				<c:forTokens items="${questionTypesAvailable}" delims="," var="questionTypeIter">
+					<option value="${questionTypeIter}"
+						<c:if test="${questionTypeIter == questionType}">selected="selected"</c:if>>
+		  							
+						<c:choose>
+							<c:when test="${questionTypeIter == 1}">
+								<fmt:message key="label.question.type.multiple.choice" />
+							</c:when>
+							<c:when test="${questionTypeIter == 2}">
+								<fmt:message key="label.question.type.matching.pairs" />
+							</c:when>
+							<c:when test="${questionTypeIter == 3}">
+								<fmt:message key="label.question.type.short.answer" />
+							</c:when>
+							<c:when test="${questionTypeIter == 4}">
+								<fmt:message key="label.question.type.numerical" />
+							</c:when>
+							<c:when test="${questionTypeIter == 5}">
+								<fmt:message key="label.question.type.true.false" />
+							</c:when>
+							<c:when test="${questionTypeIter == 6}">
+								<fmt:message key="label.question.type.essay" />
+							</c:when>
+							<c:when test="${questionTypeIter == 7}">
+								<fmt:message key="label.question.type.ordering" />
+							</c:when>
+							<c:when test="${questionTypeIter == 8}">
+								<fmt:message key="label.question.type.mark.hedging" />
+							</c:when>
+						</c:choose>
+					</option>
+				</c:forTokens>
+			</select>
 		</div>
-			
-		<div class="panel-body">
-			<%@ include file="searchWidget.jsp"%>
-		</div>
+	</c:if>
+</div>
+
+<div id="grid-container">
+	<div class="grid-holder col-xs-12 col-sm-4">
+		<table id="questions-grid" class="scroll"></table>
+		<div id="questions-grid-pager" class="scroll"></div>
 	</div>
-	
-	<footer class="footer fixed-bottom">
-		<div class="panel-heading">
-        	<div class="pull-right">
-			    <a href="#nogo" onclick="javascript:self.parent.tb_remove();" class="btn btn-sm btn-default loffset5" style="display: inline;">
-					<fmt:message key="button.close" />
-				</a>
-			</div>	
-      	</div>
-    </footer>
-</body>
-</lams:html>
+				
+	<div id="question-detail-area" class="col-xs-12 col-sm-8"></div>
+</div>
Fisheye: Tag d064905749470c0f9d9ffd8b7d8614529d533a88 refers to a dead (removed) revision in file `lams_central/web/qb/searchWidget.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_assessment/web/pages/authoring/basic.jsp
===================================================================
diff -u -re7f6df71275535cf4af43f3ff4479a8c58e0be50 -rd064905749470c0f9d9ffd8b7d8614529d533a88
--- lams_tool_assessment/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision e7f6df71275535cf4af43f3ff4479a8c58e0be50)
+++ lams_tool_assessment/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision d064905749470c0f9d9ffd8b7d8614529d533a88)
@@ -18,7 +18,10 @@
 		font-weight: 500;
 		font-style: normal;
 	}
-	    
+	
+	#add-question-div {
+		margin-top: -5px;
+	}
 </style>
 
 <script lang="javascript">
@@ -31,8 +34,7 @@
 				"<lams:LAMSURL/>/searchQB/start.do",
 				{
 					returnUrl: "<c:url value='/authoring/importQbQuestion.do'/>?sessionMapID=${sessionMapID}",
-					toolContentId: ${sessionMap.toolContentID},
-					isFullJspRequested: false
+					toolContentId: ${sessionMap.toolContentID}
 				},
 				function() {
 					$(this).removeClass("contains-nothing");
@@ -167,7 +169,7 @@
 
 <c:if test="${!isAuthoringRestricted}">
 	<!-- Dropdown menu for choosing a question type -->
-	<div class="form-inline form-group pull-right" style="margin-top: -5px;">
+	<div id="add-question-div" class="form-inline form-group pull-right">
 		<select id="questionType" class="form-control input-sm">
 			<option selected="selected" value="1"><fmt:message key="label.authoring.basic.type.multiple.choice" /></option>
 			<option value="2"><fmt:message key="label.authoring.basic.type.matching.pairs" /></option>
Index: lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r394f403c289f0fd7808c228840bead5c4e7d5d32 -rd064905749470c0f9d9ffd8b7d8614529d533a88
--- lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 394f403c289f0fd7808c228840bead5c4e7d5d32)
+++ lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision d064905749470c0f9d9ffd8b7d8614529d533a88)
@@ -244,4 +244,6 @@
 label.qb.difficulty.index =Difficulty index
 label.qb.discrimination.index =Discrimination index
 label.qb.point.biserial =Point biserial
+label.question.bank  =Question bank
+
 #======= End labels: Exported 228 labels for en AU =====
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McController.java
===================================================================
diff -u -r394f403c289f0fd7808c228840bead5c4e7d5d32 -rd064905749470c0f9d9ffd8b7d8614529d533a88
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McController.java	(.../McController.java)	(revision 394f403c289f0fd7808c228840bead5c4e7d5d32)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McController.java	(.../McController.java)	(revision d064905749470c0f9d9ffd8b7d8614529d533a88)
@@ -65,6 +65,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;
 
 /**
  * Action class that controls the logic of tool behavior.
@@ -439,18 +440,17 @@
      */
     @SuppressWarnings("unchecked")
     @RequestMapping(value = "/importQbQuestion", method = RequestMethod.POST)
-    private String importQbQuestion(HttpServletRequest request) {
-	String sessionMapId = WebUtil.readStrParam(request, McAppConstants.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);
 	request.setAttribute(McAppConstants.ATTR_SESSION_MAP_ID, sessionMapId);
 	List<McQuestionDTO> questionDtos = (List<McQuestionDTO>) sessionMap.get(McAppConstants.QUESTION_DTOS);
 
 	//get QbQuestion from DB
-	Long qbQuestionUid = WebUtil.readLongParam(request, "qbQuestionUid");
 	QbQuestion qbQuestion = qbService.getQuestionByUid(qbQuestionUid);	
 	
-	//finding max displayOrder
+	//find max displayOrder
 	int maxDisplayOrder = 0;
 	for (McQuestionDTO questionDto : questionDtos) {
 	    int displayOrder = questionDto.getDisplayOrder();
Index: lams_tool_lamc/web/authoring/BasicContent.jsp
===================================================================
diff -u -r394f403c289f0fd7808c228840bead5c4e7d5d32 -rd064905749470c0f9d9ffd8b7d8614529d533a88
--- lams_tool_lamc/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision 394f403c289f0fd7808c228840bead5c4e7d5d32)
+++ lams_tool_lamc/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision d064905749470c0f9d9ffd8b7d8614529d533a88)
@@ -6,9 +6,31 @@
 	#itemList .panel-heading.panel-title {
 		overflow:hidden;
 	}
+	#question-bank-div {
+    	margin-top: 75px;
+	}
+	#add-question-div {
+		margin-top: -5px;
+	}
 </style>
 
 <script type="text/javascript">
+	$(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}
+				},
+				function() {
+					$(this).removeClass("contains-nothing");
+				}
+			);
+		})
+	});
+
 	function removeQuestion(questionIndex) {
 		document.forms.mcAuthoringForm.questionIndex.value=questionIndex;
 		document.forms.mcAuthoringForm.action='removeQuestion.do'; 
@@ -46,11 +68,29 @@
 <div id="itemArea">
 	<%@ include file="/authoring/itemlist.jsp"%>
 </div>
+
 <c:if test="${!isAuthoringRestricted}">
-	<p>
+	<div id="add-question-div" class="form-inline form-group pull-right">
 		<a href="<lams:WebAppURL />authoring/editQuestionBox.do?sessionMapId=${sessionMapId}&KeepThis=true&TB_iframe=true&modal=true"
 			class="btn btn-default btn-sm thickbox"> 
-			<i class="fa fa-plus"></i>&nbsp;<fmt:message key="label.save.question" /> 
+			<i class="fa fa-lg fa-plus-circle" aria-hidden="true" title="<fmt:message key="label.save.question" />"></i>&nbsp;
+			<fmt:message key="label.save.question" /> 
 		</a>
-	</p>
-</c:if>
\ No newline at end of file
+	</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:if>
Index: lams_tool_lamc/web/authoring/itemlist.jsp
===================================================================
diff -u -r394f403c289f0fd7808c228840bead5c4e7d5d32 -rd064905749470c0f9d9ffd8b7d8614529d533a88
--- lams_tool_lamc/web/authoring/itemlist.jsp	(.../itemlist.jsp)	(revision 394f403c289f0fd7808c228840bead5c4e7d5d32)
+++ lams_tool_lamc/web/authoring/itemlist.jsp	(.../itemlist.jsp)	(revision d064905749470c0f9d9ffd8b7d8614529d533a88)
@@ -25,26 +25,11 @@
 </script>
 
 <div id="itemList">
-	<div class="panel panel-default add-file">
+<div class="panel panel-default add-file">
 	
 	<div class="panel-heading panel-title">
 		<fmt:message key="label.questions" />
 		<i class="fa fa-spinner" style="display: none" id="itemArea_Busy"></i>
-		
-		<c:if test="${!isAuthoringRestricted}">
-			<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"> 
-					<fmt:message key="label.import.from.question.bank"/>
-				</a>
-			</div>
-		</c:if>
 	</div>
 
 	<table id="itemTable" class="table table-striped table-condensed">
@@ -76,6 +61,12 @@
 								<c:out value="${questionDto.description}" escapeXml="false" />
 							</div>
 						</c:if>
+						
+						<!-- 
+					    <span class='pull-right alert-info btn-xs loffset5 roffset5'>
+					    	v.&nbsp;${questionDto.version}
+					    </span>	
+					     -->
 					</div>
 				</td>
 
@@ -120,5 +111,5 @@
 		</c:forEach>
 
 	</table>
-	</div>
 </div>
+</div>
Index: lams_tool_scratchie/web/pages/authoring/authoring.jsp
===================================================================
diff -u -re7f6df71275535cf4af43f3ff4479a8c58e0be50 -rd064905749470c0f9d9ffd8b7d8614529d533a88
--- lams_tool_scratchie/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision e7f6df71275535cf4af43f3ff4479a8c58e0be50)
+++ lams_tool_scratchie/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision d064905749470c0f9d9ffd8b7d8614529d533a88)
@@ -19,6 +19,9 @@
 		#question-bank-div {
     		margin-top: 75px;
 		}
+		#add-question-div {
+			margin-top: -5px;
+		}
 	</style>
 	
 	<script>
Index: lams_tool_scratchie/web/pages/authoring/basic.jsp
===================================================================
diff -u -re7f6df71275535cf4af43f3ff4479a8c58e0be50 -rd064905749470c0f9d9ffd8b7d8614529d533a88
--- lams_tool_scratchie/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision e7f6df71275535cf4af43f3ff4479a8c58e0be50)
+++ lams_tool_scratchie/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision d064905749470c0f9d9ffd8b7d8614529d533a88)
@@ -6,16 +6,14 @@
 </c:if>
 
 <script lang="javascript">
-
 	$(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
+					toolContentId: ${sessionMap.toolContentID}
 				},
 				function() {
 					$(this).removeClass("contains-nothing");
@@ -85,11 +83,11 @@
 </div>
 
 <!-- Items -->
-<div  id="itemArea">
+<div id="itemArea">
 	<%@ include file="parts/itemlist.jsp"%>
 </div>
 
-<div class="form-inline form-group pull-right" style="margin-top: -5px;">
+<div id="add-question-div" class="form-inline form-group pull-right">
 	<c:set var="addItemUrl" >
 		<c:url value='/authoring/addItem.do'/>?sessionMapID=${sessionMapID}&KeepThis=true&TB_iframe=true&modal=true
 	</c:set>