Index: lams_central/web/authoring/template/tbl/tbl.jsp
===================================================================
diff -u -r495d8ba0d70ac286d4e8aaa40dd390669cf59e99 -r1e00a1520cb647f11477e7eafe28532d1ba3de7d
--- lams_central/web/authoring/template/tbl/tbl.jsp	(.../tbl.jsp)	(revision 495d8ba0d70ac286d4e8aaa40dd390669cf59e99)
+++ lams_central/web/authoring/template/tbl/tbl.jsp	(.../tbl.jsp)	(revision 1e00a1520cb647f11477e7eafe28532d1ba3de7d)
@@ -211,7 +211,7 @@
 		
 			<span class="voffset10">
 			<a href="#" id="createQuestionButton" onclick="javascript:createQuestion('numQuestions', 'divq', 'divquestions', '', '');" class="btn btn-default"><i class="fa fa-plus"></i> <fmt:message key="authoring.create.question"/></a>
-			<a href="#" onClick="javascript:importQTI('mcq', 'mc')" class="btn btn-default pull-right">	<i class="fa fa-upload"></i> <fmt:message key="authoring.template.basic.import.qti" /></a>
+			<a href="#" id="importQTIButton" onClick="javascript:importQTI('mcq', 'mc')" class="btn btn-default pull-right">	<i class="fa fa-upload"></i> <fmt:message key="authoring.template.basic.import.qti" /></a>
 			</span>
 			
 	    </div>
Index: lams_tool_assessment/web/pages/authoring/parts/addessay.jsp
===================================================================
diff -u -rdfcdbcb8e8c78950620a1013c07763d43eda55f2 -r1e00a1520cb647f11477e7eafe28532d1ba3de7d
--- lams_tool_assessment/web/pages/authoring/parts/addessay.jsp	(.../addessay.jsp)	(revision dfcdbcb8e8c78950620a1013c07763d43eda55f2)
+++ lams_tool_assessment/web/pages/authoring/parts/addessay.jsp	(.../addessay.jsp)	(revision 1e00a1520cb647f11477e7eafe28532d1ba3de7d)
@@ -189,7 +189,7 @@
 			</form:form>
 			
 			<div class="voffset10 pull-right">
-			    <a href="#nogo" onclick="javascript:self.parent.tb_remove();" class="btn btn-sm btn-default loffset5">
+			    <a href="#nogo" onclick="javascript:self.parent.tb_remove();" class="btn btn-sm btn-default loffset5" id="cancelThickbox">
 					<fmt:message key="label.cancel" />
 				</a>
 				<a href="#nogo" onclick="javascript:$('#assessmentQuestionForm').submit();" class="btn btn-sm btn-default button-add-item">
Index: lams_tool_assessment/web/pages/authoring/parts/addmultiplechoice.jsp
===================================================================
diff -u -r67d7232f087b9f5c72ff41f7bbebe29cff81e099 -r1e00a1520cb647f11477e7eafe28532d1ba3de7d
--- lams_tool_assessment/web/pages/authoring/parts/addmultiplechoice.jsp	(.../addmultiplechoice.jsp)	(revision 67d7232f087b9f5c72ff41f7bbebe29cff81e099)
+++ lams_tool_assessment/web/pages/authoring/parts/addmultiplechoice.jsp	(.../addmultiplechoice.jsp)	(revision 1e00a1520cb647f11477e7eafe28532d1ba3de7d)
@@ -286,7 +286,7 @@
 			
 		<br/>
 			<div class="voffset10 pull-right">
-			    <a href="#nogo" onclick="javascript:self.parent.tb_remove();" class="btn btn-sm btn-default loffset5">
+			    <a href="#nogo" onclick="javascript:self.parent.tb_remove();" class="btn btn-sm btn-default loffset5" id="cancelThickbox">
 					<fmt:message key="label.cancel" />
 				</a>
 				<a href="#nogo" onclick="javascript:$('#assessmentQuestionForm').submit();" class="btn btn-sm btn-default button-add-item">
Index: lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp
===================================================================
diff -u -r67d7232f087b9f5c72ff41f7bbebe29cff81e099 -r1e00a1520cb647f11477e7eafe28532d1ba3de7d
--- lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp	(.../questionlist.jsp)	(revision 67d7232f087b9f5c72ff41f7bbebe29cff81e099)
+++ lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp	(.../questionlist.jsp)	(revision 1e00a1520cb647f11477e7eafe28532d1ba3de7d)
@@ -150,8 +150,8 @@
 		</tr>	
 	
 		<c:forEach var="question" items="${sessionMap.questionList}" varStatus="status">
-			<tr>
-				<td>
+			<tr id="question${question.sequenceId}">
+				<td id="question${question.sequenceId}Type">
 					<c:choose>
 						<c:when test="${question.type == 1}">
 							<fmt:message key="label.authoring.basic.type.multiple.choice" />
@@ -179,19 +179,19 @@
 						</c:when>
 					</c:choose>
 				</td>
-				<td>
+				<td id="question${question.sequenceId}Title">
 					<c:out value="${question.title}" escapeXml="true" />
 				</td>
 				
 				<td class="text-right">
 					<c:set var="editQuestionUrl" >
 						<c:url value='/authoring/editQuestion.do'/>?sessionMapID=${sessionMapID}&questionSequenceId=${question.sequenceId}&KeepThis=true&TB_iframe=true&modal=true
 					</c:set>
-					<a href="${editQuestionUrl}" class="thickbox roffset5" style="margin-left: 20px;"> 
+					<a href="${editQuestionUrl}" class="thickbox roffset5" style="margin-left: 20px;"  id="question${question.sequenceId}Edit"> 
 						<i class="fa fa-pencil"	title="<fmt:message key="label.authoring.basic.edit" />"></i>
 					</a>
 						
-					<i class="fa fa-times" title="<fmt:message key="label.authoring.basic.delete" />"
+					<i class="fa fa-times" title="<fmt:message key="label.authoring.basic.delete" />" id="question${question.sequenceId}Delete"
 						onclick="javascript:deleteQuestion(${question.sequenceId})"></i>
 				</td>
 			</tr>