Index: lams_tool_assessment/web/pages/authoring/basic.jsp
===================================================================
diff -u -rfb2d35766faadf7fa8e0247feb943da34f8fba4f -rc033158fe4987791d7a8902d16316b4d6a3cf1ef
--- lams_tool_assessment/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
+++ lams_tool_assessment/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision c033158fe4987791d7a8902d16316b4d6a3cf1ef)
@@ -188,7 +188,7 @@
     	<fmt:message key="label.authoring.basic.instruction"/>
     </label>
 	<lams:CKEditor id="assessment.instructions" value="${formBean.assessment.instructions}"
-			contentFolderID="${formBean.contentFolderID}" height="400">
+			contentFolderID="${formBean.contentFolderID}">
 	</lams:CKEditor>
 </div>
 
@@ -213,26 +213,7 @@
 	<a onclick="createNewQuestionInitHref();return false;" href="" class="btn btn-default btn-sm button-add-item thickbox" id="newQuestionInitHref">  
 		<fmt:message key="label.authoring.basic.add.question.to.pool" />
 	</a>
-	
-	<c:set var="importInitUrl" >
-		<c:url value='/authoring/importInit.do'/>?sessionMapID=${sessionMapID}&KeepThis=true&TB_iframe=true&height=240&width=650
-	</c:set>
-	<a href="${importInitUrl}" class="btn btn-default btn-xs pull-right loffset5 thickbox" id="importButton">  
-		<fmt:message key="label.authoring.basic.import.questions" />
-	</a>
-	
-	<a onclick="javascript:exportQuestions();" class="btn btn-default btn-xs pull-right" id="exportButton">  
-		<fmt:message key="label.authoring.basic.export.questions" />
-	</a>
-	
-	<br>
-	<a href="#nogo" onClick="javascript:importQTI()" class="btn btn-default btn-xs pull-right loffset5">
-		<fmt:message key="label.authoring.basic.import.qti" /> 
-	</a>
-	<a href="#nogo" onClick="javascript:exportQTI()" class="btn btn-default btn-xs pull-right">
-		<fmt:message key="label.authoring.basic.export.qti" />
-	</a>
-
+		
 </div>
 <br><br>
 
Index: lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp
===================================================================
diff -u -rf8a6769c592d3ace389917bad0999f197e27948b -rc033158fe4987791d7a8902d16316b4d6a3cf1ef
--- lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp	(.../questionlist.jsp)	(revision f8a6769c592d3ace389917bad0999f197e27948b)
+++ lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp	(.../questionlist.jsp)	(revision c033158fe4987791d7a8902d16316b4d6a3cf1ef)
@@ -122,6 +122,27 @@
 <div class="panel panel-default voffset20">
 	<div class="panel-heading panel-title">
 		<fmt:message key="label.authoring.basic.question.bank.title" />
+		<div class="btn-group btn-group-xs pull-right" role="group">
+			<a href="#nogo" onClick="javascript:importQTI()" class="btn btn-default">
+				<fmt:message key="label.authoring.basic.import.qti" /> 
+			</a>
+			<a href="#nogo" onClick="javascript:exportQTI()" class="btn btn-default">
+				<fmt:message key="label.authoring.basic.export.qti" />
+			</a>
+		</div>
+		<div class="btn-group btn-group-xs pull-right roffset5" role="group">		
+			<c:set var="importInitUrl" >
+				<c:url value='/authoring/importInit.do'/>?sessionMapID=${sessionMapID}&KeepThis=true&TB_iframe=true&height=240&width=650
+			</c:set>
+			<a href="${importInitUrl}" class="btn btn-default btn-xs loffset5 thickbox" id="importButton">  
+				<fmt:message key="label.authoring.basic.import.questions" />
+			</a>
+			<a onclick="javascript:exportQuestions();" class="btn btn-default btn-xs " id="exportButton">  
+				<fmt:message key="label.authoring.basic.export.questions" />
+			</a>
+		</div>	
+
+		
 	</div>
 
 	<table class="table table-condensed" id="questionTable">