Index: lams_central/web/includes/javascript/main.js
===================================================================
diff -u -r8e438e0446b9c5c3470ee3044fa15360307416a1 -r2471b37f4df96b3f1930cf8dea8936b982d43e61
--- lams_central/web/includes/javascript/main.js	(.../main.js)	(revision 8e438e0446b9c5c3470ee3044fa15360307416a1)
+++ lams_central/web/includes/javascript/main.js	(.../main.js)	(revision 2471b37f4df96b3f1930cf8dea8936b982d43e61)
@@ -180,7 +180,8 @@
 		'open' : function() {
 			var dialog = $(this);
 			// load contents after opening the dialog
-			$('iframe', dialog).attr('src', LAMS_URL + 'index.do?redirect=profile');
+			$('iframe', dialog).attr({'src': LAMS_URL + 'index.do?redirect=profile',
+				'id' : 'myProfileModal'});
 			
 			// in case of mobile devices allow iframe scrolling
 			if( /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent) ) {
@@ -284,9 +285,10 @@
 			'title' : LABELS.MONITORING_TITLE,
 			'open' : function() {
 				// load contents after opening the dialog
-				$('iframe', this).attr('src', LAMS_URL
+				$('iframe', this).attr({'src': LAMS_URL
 					+ 'home/monitorLesson.do?lessonID='
-					+ $(this).data('lessonID'));
+					+ $(this).data('lessonID'),
+					'id' : 'monitorModal'});
 			},
 
 		}, true, true);
@@ -328,9 +330,10 @@
 			var dialog = $(this);
 			// load contents after opening the dialog
 			$('iframe', dialog)
-					.attr('src', LAMS_URL
+					.attr({'src': LAMS_URL
 						+ 'home/addLesson.do?organisationID='
-						+ dialog.data('orgID'));
+						+ dialog.data('orgID'),
+						'id' : 'addLessonModal'});
 			
 			// in case of mobile devices allow iframe scrolling
 			if( /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent) ) {
@@ -353,8 +356,9 @@
 		'title' : LABELS.COURSE_GROUPS_TITLE,
 		'open' : function() {
 			// load contents after opening the dialog
-			$('iframe', this).attr('src', LAMS_URL + 'organisationGroup/viewGroupings.do?organisationID=' + orgID
-												   + (activityID ? '&activityID=' + activityID : ''));
+			$('iframe', this).attr({'src': LAMS_URL + 'organisationGroup/viewGroupings.do?organisationID=' + orgID
+												   + (activityID ? '&activityID=' + activityID : ''),
+													'id' : 'orgGroupingModal'});
 		}
 	}, true);
 }
@@ -367,7 +371,8 @@
 		'title' : LABELS.COURSE_GROUPS_TITLE,
 		'open' : function() {
 			// load contents after opening the dialog
-			$('iframe', this).attr('src', url);
+			$('iframe', this).attr({'src': url,
+				'id' : 'orgGroupModal'});
 		}
 	}, true);
 }
@@ -472,8 +477,9 @@
 		'open' : function() {
 			console.log("width "+$(window).width()+":"+Math.max(380, Math.min(955, $(window).width() - 60)));
 			// load contents after opening the dialog
-			$('iframe', this).attr('src', LAMS_URL
-				+ 'gradebook/gradebookMonitoring/courseMonitor.do?organisationID=' + orgID);
+			$('iframe', this).attr({'src': LAMS_URL
+				+ 'gradebook/gradebookMonitoring/courseMonitor.do?organisationID=' + orgID,
+				'id' : 'gradebookCourseModal'});
 		}
 	}, true);
 }
@@ -490,8 +496,9 @@
 		'open' : function() {
 			var orgID = $(this).data('orgID');
 			// load contents after opening the dialog
-			$('iframe', this).attr('src', LAMS_URL
-				+ 'gradebook/gradebookLearning/courseLearner.do?organisationID=' + orgID);
+			$('iframe', this).attr({'src': LAMS_URL
+				+ 'gradebook/gradebookLearning/courseLearner.do?organisationID=' + orgID,
+				'id' : 'gradebookLearnerModal'});
 		}
 	}, true);
 }
@@ -508,8 +515,9 @@
 		'open' : function() {
 			var lessonID = $(this).data('lessonID');
 			// load contents after opening the dialog
-			$('iframe', this).attr('src', LAMS_URL
-				+ 'lessonConditions/getIndexLessonConditions.do?lsId=' + lessonID);
+			$('iframe', this).attr({'src': LAMS_URL
+				+ 'lessonConditions/getIndexLessonConditions.do?lsId=' + lessonID,
+				'id' : 'conditionsModal'});
 		}
 	}, true);
 }
@@ -526,8 +534,9 @@
 		'open' : function() {
 			var orgID = $(this).data('orgID');
 			// load contents after opening the dialog
-			$('iframe', this).attr('src', LAMS_URL
-				+ 'findUserLessons/getResults.do?courseID=' + orgID);
+			$('iframe', this).attr({'src': LAMS_URL
+				+ 'findUserLessons/getResults.do?courseID=' + orgID,
+				'id' : 'searchLessonModal'});
 		}
 	}, true);
 }
@@ -544,7 +553,8 @@
 		'open' : function() {
 			var orgID = $(this).data('orgID');
 			// load contents after opening the dialog
-			$('iframe', this).attr('src', LAMS_URL	+ 'learning/kumalive/getRubrics.do?organisationID=' + orgID);
+			$('iframe', this).attr({'src': LAMS_URL	+ 'learning/kumalive/getRubrics.do?organisationID=' + orgID,
+				'id' : 'kumaliveModal'});
 		}
 	}, false);
 }
@@ -561,7 +571,8 @@
 		'open' : function() {
 			var orgID = $(this).data('orgID');
 			// load contents after opening the dialog
-			$('iframe', this).attr('src', LAMS_URL	+ 'learning/kumalive/getReport.do?organisationID=' + orgID);
+			$('iframe', this).attr({'src': LAMS_URL	+ 'learning/kumalive/getReport.do?organisationID=' + orgID,
+				'id' : 'kumaliveReportsModal'});
 		}
 	}, false);
 }
@@ -575,9 +586,10 @@
 			var dialog = $(this);
 			// load contents after opening the dialog
 			$('iframe', dialog)
-					.attr('src', LAMS_URL
+					.attr({'src': LAMS_URL
 						+ 'outcome.do?method=outcomeManage&organisationID='
-						+ organisationID);
+						+ organisationID,
+						'id' : 'outcomeModal'});
 		}
 	});
 }
Index: lams_central/web/questions/questionChoice.jsp
===================================================================
diff -u -r8f91eb2dd3889777ce3c007349900c6b58817421 -r2471b37f4df96b3f1930cf8dea8936b982d43e61
--- lams_central/web/questions/questionChoice.jsp	(.../questionChoice.jsp)	(revision 8f91eb2dd3889777ce3c007349900c6b58817421)
+++ lams_central/web/questions/questionChoice.jsp	(.../questionChoice.jsp)	(revision 2471b37f4df96b3f1930cf8dea8936b982d43e61)
@@ -248,7 +248,7 @@
 		
 		<div id="buttonsDiv" class="voffset10 pull-right">
 			<input class="btn btn-default" value='<fmt:message key="button.cancel"/>' type="button" onClick="javascript:window.close()" />
-			<input class="btn btn-primary" value='<fmt:message key="label.ok"/>'      type="button" onClick="javascript:submitForm()" />			
+			<input id="submitButton" class="btn btn-primary" value='<fmt:message key="label.ok"/>'      type="button" onClick="javascript:submitForm()" />			
 		</div>
 	</form>
 
Index: lams_central/web/questions/questionFile.jsp
===================================================================
diff -u -r3f18890e24de43c31ac23d49e2c1a4906e479863 -r2471b37f4df96b3f1930cf8dea8936b982d43e61
--- lams_central/web/questions/questionFile.jsp	(.../questionFile.jsp)	(revision 3f18890e24de43c31ac23d49e2c1a4906e479863)
+++ lams_central/web/questions/questionFile.jsp	(.../questionFile.jsp)	(revision 2471b37f4df96b3f1930cf8dea8936b982d43e61)
@@ -69,7 +69,7 @@
 				<div class="pull-right voffset5" id="buttonsDiv">
 					<input class="btn btn-sm btn-default" value='<fmt:message key="button.cancel"/>' type="button"
 						onClick="javascript:window.close()" />
-					<button class="btn btn-sm btn-primary" value='<fmt:message key="label.upload"/>' type="submit">
+					<button id="importButton" class="btn btn-sm btn-primary" value='<fmt:message key="label.upload"/>' type="submit">
 						<fmt:message key="button.import" />
 					</button>
 				</div>
Index: lams_tool_lamc/web/authoring/itemlist.jsp
===================================================================
diff -u -r495d8ba0d70ac286d4e8aaa40dd390669cf59e99 -r2471b37f4df96b3f1930cf8dea8936b982d43e61
--- lams_tool_lamc/web/authoring/itemlist.jsp	(.../itemlist.jsp)	(revision 495d8ba0d70ac286d4e8aaa40dd390669cf59e99)
+++ lams_tool_lamc/web/authoring/itemlist.jsp	(.../itemlist.jsp)	(revision 2471b37f4df96b3f1930cf8dea8936b982d43e61)
@@ -11,11 +11,11 @@
 		<i class="fa fa-spinner" style="display: none" id="resourceListArea_Busy"></i>
 		<div class="btn-group btn-group-xs pull-right">
 			<c:if test="${!isAuthoringRestricted}">
-				<a href="#nogo" onClick="javascript:importQTI()" class="btn btn-default" id="importQTI">
+				<a id="importQTILink" href="#nogo" onClick="javascript:importQTI()" class="btn btn-default" id="importQTI">
 					<fmt:message key="label.authoring.import.qti" />
 				</a>
 			</c:if>
-			<a href="#nogo" onClick="javascript:exportQTI()" class="btn btn-default" id="exportQTI">
+			<a id="exportQTILink" href="#nogo" onClick="javascript:exportQTI()" class="btn btn-default" id="exportQTI">
 				<fmt:message key="label.authoring.export.qti" />
 			</a>
 		</div>
Index: lams_tool_scratchie/web/pages/authoring/parts/itemlist.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r2471b37f4df96b3f1930cf8dea8936b982d43e61
--- lams_tool_scratchie/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_scratchie/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision 2471b37f4df96b3f1930cf8dea8936b982d43e61)
@@ -4,10 +4,10 @@
 <div class="panel panel-default voffset20">
 	<div class="panel-heading panel-title">
 		<div id="importExport" class="btn-group pull-right">
-			<a href="#" onClick="javascript:importQTI();return false;" class="btn btn-default btn-xs loffset5">
+			<a id="importQTILink" href="#" onClick="javascript:importQTI();return false;" class="btn btn-default btn-xs loffset5">
 				<fmt:message key="label.authoring.import.qti" /> 
 			</a>
-			<a href="#" onClick="javascript:exportQTI();return false;" class="btn btn-default btn-xs loffset5">
+			<a id="exportQTILink" href="#" onClick="javascript:exportQTI();return false;" class="btn btn-default btn-xs loffset5">
 				<fmt:message key="label.authoring.export.qti" />
 			</a>
 		</div>