Index: lams_tool_assessment/web/pages/authoring/basic.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/authoring/basic.jsp,v
diff -u -r1.19.2.3 -r1.19.2.4
--- lams_tool_assessment/web/pages/authoring/basic.jsp	1 Jun 2016 14:05:16 -0000	1.19.2.3
+++ lams_tool_assessment/web/pages/authoring/basic.jsp	9 Nov 2016 17:14:08 -0000	1.19.2.4
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp,v
diff -u -r1.7.2.5 -r1.7.2.6
--- lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp	23 Sep 2016 07:27:44 -0000	1.7.2.5
+++ lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp	9 Nov 2016 17:14:08 -0000	1.7.2.6
@@ -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">