Index: lams_admin/web/userlist.jsp
===================================================================
diff -u -read5d983137f06698c17843087000cb3545e7b34 -r05c00f92856ef13cd90d6fce06acb069418c2512
--- lams_admin/web/userlist.jsp	(.../userlist.jsp)	(revision ead5d983137f06698c17843087000cb3545e7b34)
+++ lams_admin/web/userlist.jsp	(.../userlist.jsp)	(revision 05c00f92856ef13cd90d6fce06acb069418c2512)
@@ -163,7 +163,7 @@
 								 
 							</c:if>
 							<c:if test="${userManageForm.courseAdminCanAddNewUsers}">
-                            	<a title="<fmt:message key="admin.edit" />" href="<lams:LAMSURL/>admin/user/edit.do?userId=<c:out value="${userManageBean.userId}" />&orgId=<c:out value="${userManageForm.orgId}"/>"><button type="button" class="btn btn-primary btn-xs"><i class="fa fa-pencil"></i> <span class="hidden-xs hidden-sm"><fmt:message key="admin.edit" /></span></button></a>
+                            	<a title="<fmt:message key="admin.edit" />" href="<lams:LAMSURL/>admin/user/edit.do?userId=<c:out value="${userManageBean.userId}" />&orgId=<c:out value="${userManageForm.orgId}"/>"  id="userEdit${userManageBean.userId}"><button type="button" class="btn btn-primary btn-xs"><i class="fa fa-pencil"></i> <span class="hidden-xs hidden-sm"><fmt:message key="admin.edit" /></span></button></a>
 								&nbsp;
 							</c:if>
 							<c:if test="${canDeleteUser}">
Index: lams_admin/web/usersearchlist.jsp
===================================================================
diff -u -r002370657c7bc0bf87eef9c223e1778f74483413 -r05c00f92856ef13cd90d6fce06acb069418c2512
--- lams_admin/web/usersearchlist.jsp	(.../usersearchlist.jsp)	(revision 002370657c7bc0bf87eef9c223e1778f74483413)
+++ lams_admin/web/usersearchlist.jsp	(.../usersearchlist.jsp)	(revision 05c00f92856ef13cd90d6fce06acb069418c2512)
@@ -95,7 +95,7 @@
 								rows += 	'&nbsp;';
 								rows +=     '<form style="display: inline-block;" id="delete_' + orgData["userId"] +'" method="post" action="/lams/admin/user/edit.do"><input type="hidden" name="userId" value="' + orgData["userId"] + '"/><input type="hidden" name="<csrf:tokenname/>" value="<csrf:tokenvalue/>"/><button class="btn btn-primary btn-xs" type="submit"><i class="fa fa-pencil"/> <span class="hidden-xs hidden-sm"><fmt:message key="admin.edit"/></span></button></form>';
 								rows += 	'&nbsp;';
-								rows += 	'<a title="<fmt:message key="label.login.as"/>" href="<lams:LAMSURL/>loginas.do?login=' + orgData["login"] + '">';
+								rows += 	'<a title="<fmt:message key="label.login.as"/>" href="<lams:LAMSURL/>loginas.do?login=' + orgData["login"] + '" id="loginAs' + orgData["userId"] +'">';
 								rows += 		'<button type="button" class="btn btn-primary btn-xs"><i class="fa fa-sign-in"/><span class="hidden-xs hidden-sm"> <fmt:message key="label.login.as"/></span></button>';
 								rows += 	'</a>';
 								rows += 	'&nbsp;';
Index: lams_central/web/authoring/template/tbl/tbl.jsp
===================================================================
diff -u -rc5f1c588cb57eb6b7c14d1ad679d6c2c1925b319 -r05c00f92856ef13cd90d6fce06acb069418c2512
--- lams_central/web/authoring/template/tbl/tbl.jsp	(.../tbl.jsp)	(revision c5f1c588cb57eb6b7c14d1ad679d6c2c1925b319)
+++ lams_central/web/authoring/template/tbl/tbl.jsp	(.../tbl.jsp)	(revision 05c00f92856ef13cd90d6fce06acb069418c2512)
@@ -279,7 +279,7 @@
 					</ul>
 				</div>
 				
-				<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>
 			
 			<!-- Question Bank -->
Index: lams_central/web/includes/javascript/main.js
===================================================================
diff -u -ra65568cc36db07abf19550359c0db03a9561c964 -r05c00f92856ef13cd90d6fce06acb069418c2512
--- lams_central/web/includes/javascript/main.js	(.../main.js)	(revision a65568cc36db07abf19550359c0db03a9561c964)
+++ lams_central/web/includes/javascript/main.js	(.../main.js)	(revision 05c00f92856ef13cd90d6fce06acb069418c2512)
@@ -199,7 +199,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) ) {
@@ -303,9 +304,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);
@@ -347,9 +349,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) ) {
@@ -372,8 +375,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);
 }
@@ -386,7 +390,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);
 }
@@ -491,8 +496,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);
 }
@@ -509,8 +515,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);
 }
@@ -527,8 +534,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);
 }
@@ -545,8 +553,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);
 }
@@ -563,7 +572,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);
 }
@@ -580,7 +590,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);
 }
@@ -594,8 +605,9 @@
 			var dialog = $(this);
 			// load contents after opening the dialog
 			$('iframe', dialog)
-					.attr('src', LAMS_URL
-						+ 'outcome.do?method=outcomeManage');
+					.attr({'src': LAMS_URL
+						+ 'outcome.do?method=outcomeManage',
+						'id' : 'outcomeModal'});
 		}
 	});
 }
Index: lams_central/web/main.jsp
===================================================================
diff -u -re6dc4db4137cfd6b07a4aa79711b9d12b39fb78e -r05c00f92856ef13cd90d6fce06acb069418c2512
--- lams_central/web/main.jsp	(.../main.jsp)	(revision e6dc4db4137cfd6b07a4aa79711b9d12b39fb78e)
+++ lams_central/web/main.jsp	(.../main.jsp)	(revision 05c00f92856ef13cd90d6fce06acb069418c2512)
@@ -207,14 +207,14 @@
 						
 				<ul class="dropdown-menu dropdown-usermenu pull-right">
 					<li>
-						<a href="#" onclick="javascript:showMyProfileDialog(); return false;">
+						<a href="#" id="showProfileButton" onclick="javascript:showMyProfileDialog(); return false;">
 							<i class="fa fa-user"></i> <fmt:message key="index.myprofile"/>
 						</a>
 					</li>
 					
 					<c:if test="${showQbCollectionsLink}">
 						<li>
-							<a href="#" onclick="javascript:openQbCollections(); return false;">
+							<a href="#" id="showQbCollectionsButton" onclick="javascript:openQbCollections(); return false;">
 								<i class="fa fa-question"></i> <fmt:message key="index.qb.collections"/>
 							</a>
 						</li>
@@ -225,14 +225,16 @@
 						<c:choose>
 		               		<c:when test="${adminlink.name == 'index.courseman'}">
 		               			<c:set var="iconClass">fa-users</c:set>
+		               			<c:set var="linkId">courseManagementButton</c:set>
 		               		</c:when>
 		               		<c:when test="${adminlink.name == 'index.sysadmin'}">
 		               			<c:set var="iconClass">fa-gear</c:set>
+		               			<c:set var="linkId">sysadminButton</c:set>
 		               		</c:when>
 		               	</c:choose>
 									
 						<li>
-							<a href="javascript:;" onclick="<c:out value="${adminlink.url}"/>">
+							<a href="javascript:;" id="<c:out value="${linkId}"/>" onclick="<c:out value="${adminlink.url}"/>">
 								<span><i class="fa ${iconClass}"></i> <fmt:message key="${adminlink.name}"/></span>
 							</a>
 						</li>
Index: lams_central/web/passwordChangeContent.jsp
===================================================================
diff -u -rdf52e287d4a5f815849470ffb1fd82a3867a6bdb -r05c00f92856ef13cd90d6fce06acb069418c2512
--- lams_central/web/passwordChangeContent.jsp	(.../passwordChangeContent.jsp)	(revision df52e287d4a5f815849470ffb1fd82a3867a6bdb)
+++ lams_central/web/passwordChangeContent.jsp	(.../passwordChangeContent.jsp)	(revision 05c00f92856ef13cd90d6fce06acb069418c2512)
@@ -149,7 +149,7 @@
 								<fmt:message key="button.cancel"/>
 							</button>
 							&nbsp;&nbsp;
-							<button type="submit" class="btn btn-sm btn-primary voffset5">
+							<button id="saveButton" type="submit" class="btn btn-sm btn-primary voffset5">
 								<fmt:message key="button.save" />
 							</button>
 						</div>
Index: lams_central/web/passwordChangeOkContent.jsp
===================================================================
diff -u -r4c2d1f37b92435907ec4ce23cb635a7cd9e4161e -r05c00f92856ef13cd90d6fce06acb069418c2512
--- lams_central/web/passwordChangeOkContent.jsp	(.../passwordChangeOkContent.jsp)	(revision 4c2d1f37b92435907ec4ce23cb635a7cd9e4161e)
+++ lams_central/web/passwordChangeOkContent.jsp	(.../passwordChangeOkContent.jsp)	(revision 05c00f92856ef13cd90d6fce06acb069418c2512)
@@ -14,12 +14,12 @@
 			<div class="col-xs-12 col-sm-8 col-sm-offset-2 col-md-6 col-md-offset-3">
 				<div class="panel voffset20">
 					<div class="panel-body">
-					<div class="col-xs-12 text-center">
+					<div class="col-xs-12 text-center"  id="msgPasswordChanged">
 						<fmt:message key="msg.password.changed"/>
 					</div>
 					
 					<div class="col-xs-12 text-center voffset10">
-						<a class="btn btn-sm btn-default"
+						<a class="btn btn-sm btn-default" id="saveButton"
 								href="<lams:LAMSURL/>${empty redirectURL ? 'index.do' : redirectURL}" role="button">
 							Ok
 						</a>
Index: lams_central/web/profile/editprofile.jsp
===================================================================
diff -u -r5f9e583fc8e476f6a5f9e1826332ba3788d7c68c -r05c00f92856ef13cd90d6fce06acb069418c2512
--- lams_central/web/profile/editprofile.jsp	(.../editprofile.jsp)	(revision 5f9e583fc8e476f6a5f9e1826332ba3788d7c68c)
+++ lams_central/web/profile/editprofile.jsp	(.../editprofile.jsp)	(revision 05c00f92856ef13cd90d6fce06acb069418c2512)
@@ -344,13 +344,13 @@
 		</div>
 			
 		<div class="form-group" align="right">
-			<button type="button" class="btn btn-sm btn-default voffset5" onclick="history.go(-1);">
+			<button type="button" class="btn btn-sm btn-default voffset5" id="cancelEditProfile" onclick="history.go(-1);">
 				<fmt:message key="button.cancel" />
 			</button>
 			&nbsp;&nbsp;
 			<c:if test="${profileEditEnabled or partialProfileEditEnabled}">
 				<button type="submit" class="btn btn-sm btn-primary voffset5" 
-						name="submit"> 
+						name="submit"  id="saveEditProfile"> 
 					<fmt:message key="button.save" />
 				</button>
 			</c:if>
Index: lams_central/web/profile/portrait.jsp
===================================================================
diff -u -rbac8a1d9f2b37ca6e26f275886b9e6603a6c0fb7 -r05c00f92856ef13cd90d6fce06acb069418c2512
--- lams_central/web/profile/portrait.jsp	(.../portrait.jsp)	(revision bac8a1d9f2b37ca6e26f275886b9e6603a6c0fb7)
+++ lams_central/web/profile/portrait.jsp	(.../portrait.jsp)	(revision 05c00f92856ef13cd90d6fce06acb069418c2512)
@@ -222,7 +222,7 @@
 
 		<c:if test="${!param.isReturnButtonHidden}">
 			<div align="right">
-				<button type="button" class="btn btn-sm btn-file btn-default offset5" onclick="history.go(-1);">
+				<button type="button" class="btn btn-sm btn-file btn-default offset5" id="portraitReturnButton" onclick="history.go(-1);">
 					<fmt:message key="label.return.to.myprofile" />
 				</button>
 			</div>
Index: lams_central/web/profile/profile.jsp
===================================================================
diff -u -r4c2d1f37b92435907ec4ce23cb635a7cd9e4161e -r05c00f92856ef13cd90d6fce06acb069418c2512
--- lams_central/web/profile/profile.jsp	(.../profile.jsp)	(revision 4c2d1f37b92435907ec4ce23cb635a7cd9e4161e)
+++ lams_central/web/profile/profile.jsp	(.../profile.jsp)	(revision 05c00f92856ef13cd90d6fce06acb069418c2512)
@@ -55,7 +55,7 @@
 					<!-- Split button -->
 					<div class="col-xs-12 text-center">
 						<a class="btn btn-sm btn-default offset5"
-								href="<lams:LAMSURL/>index.do?redirect=editprofile" role="button">
+								href="<lams:LAMSURL/>index.do?redirect=editprofile" id="editProfileButton" role="button">
 							<i class="fa fa-fw fa-pencil"></i> 
 							<span class="hidden-xs">
 								<fmt:message key="title.profile.edit.screen" />
@@ -68,7 +68,7 @@
 						<c:set var="dbId"><%=AuthenticationMethod.DB%></c:set>
 						<c:if test="${authenticationMethodId eq dbId}">
 							<a class="btn btn-sm btn-default offset5"
-									href="<lams:LAMSURL/>index.do?redirect=password&redirectURL=index.do%3Fstate%3Dactive%26redirect%3Dprofile" role="button">
+									href="<lams:LAMSURL/>index.do?redirect=password&redirectURL=index.do%3Fstate%3Dactive%26redirect%3Dprofile"  id="changePasswordButton" role="button">
 								<i class="fa fa-fw fa-lock"></i>
 								<span class="hidden-xs">
 									<fmt:message key="title.password.change.screen" />
@@ -77,14 +77,14 @@
 						</c:if>
 
 						<a class="btn btn-sm btn-default offset5"
-								href="<lams:LAMSURL/>index.do?redirect=portrait" role="button">
+								href="<lams:LAMSURL/>index.do?redirect=portrait"  id="editPortraitButton" role="button">
 							<i class="fa fa-fw fa-camera"></i> 
 							<span class="hidden-xs">
 								<fmt:message key="title.portrait.change.screen" />
 							</span>
 						</a>&nbsp;&nbsp;
 
-						<a class="btn btn-sm btn-default offset5" href="profile/policyConsents.do" role="button">
+						<a class="btn btn-sm btn-default offset5" href="profile/policyConsents.do"  id="viewPolicies" role="button">
 							<i class="fa fa-fw fa-calendar-check-o"></i> 
 							<span class="hidden-xs">
 								<fmt:message key="label.policies.consents" />
@@ -93,7 +93,7 @@
 
 						<c:if test="${showAllMyLessonLink}">
 							<a class="btn btn-sm btn-default offset5"
-									href="<lams:LAMSURL/>index.do?redirect=lessons" role="button">
+									href="<lams:LAMSURL/>index.do?redirect=lessons" id="viewAllLessons"  role="button">
 								<i class="fa fa-fw fa-book"></i> 
 								<span class="hidden-xs">
 									<fmt:message key="title.all.my.lessons" />
Index: lams_central/web/questions/questionChoice.jsp
===================================================================
diff -u -re6dc4db4137cfd6b07a4aa79711b9d12b39fb78e -r05c00f92856ef13cd90d6fce06acb069418c2512
--- lams_central/web/questions/questionChoice.jsp	(.../questionChoice.jsp)	(revision e6dc4db4137cfd6b07a4aa79711b9d12b39fb78e)
+++ lams_central/web/questions/questionChoice.jsp	(.../questionChoice.jsp)	(revision 05c00f92856ef13cd90d6fce06acb069418c2512)
@@ -83,6 +83,7 @@
 			} else {
 				$('#errorArea').show();
 			}
+
 		}
 		
 		$(document).ready(function(){
@@ -266,7 +267,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 -re6dc4db4137cfd6b07a4aa79711b9d12b39fb78e -r05c00f92856ef13cd90d6fce06acb069418c2512
--- lams_central/web/questions/questionFile.jsp	(.../questionFile.jsp)	(revision e6dc4db4137cfd6b07a4aa79711b9d12b39fb78e)
+++ lams_central/web/questions/questionFile.jsp	(.../questionFile.jsp)	(revision 05c00f92856ef13cd90d6fce06acb069418c2512)
@@ -67,7 +67,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_learning/web/gate/gateDescription.jsp
===================================================================
diff -u -r54007f98ca71e0073f19c5db78536437123287c6 -r05c00f92856ef13cd90d6fce06acb069418c2512
--- lams_learning/web/gate/gateDescription.jsp	(.../gateDescription.jsp)	(revision 54007f98ca71e0073f19c5db78536437123287c6)
+++ lams_learning/web/gate/gateDescription.jsp	(.../gateDescription.jsp)	(revision 05c00f92856ef13cd90d6fce06acb069418c2512)
@@ -3,7 +3,7 @@
     <c:if test="${!empty gateForm.gate.title}">
         <div class="panel-heading">
          <div class="panel-title">
-            <lams:out value="${gateForm.gate.title}" escapeHtml="true" />
+            <span id="gate-name"><lams:out value="${gateForm.gate.title}" escapeHtml="true" /></span>
          </div>
         </div>
     </c:if>
Index: lams_monitoring/web/gate/gateInfo.jsp
===================================================================
diff -u -rd662ddfeccbdb0b0449031cf7496c36f64155b52 -r05c00f92856ef13cd90d6fce06acb069418c2512
--- lams_monitoring/web/gate/gateInfo.jsp	(.../gateInfo.jsp)	(revision d662ddfeccbdb0b0449031cf7496c36f64155b52)
+++ lams_monitoring/web/gate/gateInfo.jsp	(.../gateInfo.jsp)	(revision 05c00f92856ef13cd90d6fce06acb069418c2512)
@@ -21,7 +21,7 @@
 				</div>
 	</div>
 </c:if>		
-<p>
+<p id="gate-waiting-learners-p">
 <span><fmt:message key="label.grouping.status"/></span> 
 	<strong> <fmt:message key="label.gate.waiting.learners">
 			<fmt:param value="${gateForm.waitingLearners}" />
Index: lams_monitoring/web/gate/gateStatus.jsp
===================================================================
diff -u -r40de3afab4e8d589660daffb6efd6e568e87f8fa -r05c00f92856ef13cd90d6fce06acb069418c2512
--- lams_monitoring/web/gate/gateStatus.jsp	(.../gateStatus.jsp)	(revision 40de3afab4e8d589660daffb6efd6e568e87f8fa)
+++ lams_monitoring/web/gate/gateStatus.jsp	(.../gateStatus.jsp)	(revision 05c00f92856ef13cd90d6fce06acb069418c2512)
@@ -13,7 +13,7 @@
 			<input type="hidden" name="<csrf:tokenname/>" value="<csrf:tokenvalue/>"/>
 			<input type="hidden" name="activityId" value="${gateForm.activityId}" />
 			<p>
-				<input type="submit" class="btn btn-primary btn-sm voffset10" value="<fmt:message key="label.gate.open"/>" />
+				<input type="submit"  id="openGateButton" class="btn btn-primary btn-sm voffset10" value="<fmt:message key="label.gate.open"/>" />
 			</p>
 		</form:form>
 	</c:if>    
Index: lams_monitoring/web/grouping/chosenGrouping.jsp
===================================================================
diff -u -r44f25ff763552baf103b1bb4ed7d1d2466a937dc -r05c00f92856ef13cd90d6fce06acb069418c2512
--- lams_monitoring/web/grouping/chosenGrouping.jsp	(.../chosenGrouping.jsp)	(revision 44f25ff763552baf103b1bb4ed7d1d2466a937dc)
+++ lams_monitoring/web/grouping/chosenGrouping.jsp	(.../chosenGrouping.jsp)	(revision 05c00f92856ef13cd90d6fce06acb069418c2512)
@@ -60,7 +60,7 @@
 		<p><fmt:message key="label.grouping.general.instructions.branching"/></p>
 	</c:if>
 	
-	<iframe src="<lams:LAMSURL/>organisationGroup/viewGroupings.do?lessonID=${param.lessonID}&activityID=${param.activityID}"></iframe>
+	<iframe id="chosenGroupingIFrame" src="<lams:LAMSURL/>organisationGroup/viewGroupings.do?lessonID=${param.lessonID}&activityID=${param.activityID}"></iframe>
 
 	</lams:Page>
 </body>
Index: lams_monitoring/web/includes/javascript/monitorLesson.js
===================================================================
diff -u -r60cffeb4566aae78d6d2e434340fa23dcda3410a -r05c00f92856ef13cd90d6fce06acb069418c2512
--- lams_monitoring/web/includes/javascript/monitorLesson.js	(.../monitorLesson.js)	(revision 60cffeb4566aae78d6d2e434340fa23dcda3410a)
+++ lams_monitoring/web/includes/javascript/monitorLesson.js	(.../monitorLesson.js)	(revision 05c00f92856ef13cd90d6fce06acb069418c2512)
@@ -641,8 +641,9 @@
 	}
 	if (contributeActivities) {
 		$.each(contributeActivities, function(){
+			var contributeId = 'contribute' + this.activityID;
 			var contributeActivity = this,
-				cell = $('<div />').addClass('contributeActivityCell').text(this.title);
+				cell = $('<div />').addClass('contributeActivityCell').text(this.title).attr('id', contributeId);
 				row = $('<div />').addClass('contributeRow').insertAfter(row).append(cell);
 			
 			$.each(this.contributeEntries, function(){
@@ -670,7 +671,7 @@
 									
 							}
 							break;
-					default : entryContent += '<span class="btn btn-xs btn-primary pull-right" onClick="javascript:openPopUp(\''
+					default : entryContent += '<span id="' + contributeId + 'Btn" class="btn btn-xs btn-primary pull-right" onClick="javascript:openPopUp(\''
 						 + this.url + '\',\'ContributeActivity\', 800, 1280, true)" title="' + LABELS.CONTRIBUTE_TOOLTIP
 						 + '">' + LABELS.CONTRIBUTE_BUTTON + '</span>';
 				}
Index: lams_tool_lamc/web/authoring/editQuestionBox.jsp
===================================================================
diff -u -r8e97adb8dda2f984a9b43f71eacd9a5033244bff -r05c00f92856ef13cd90d6fce06acb069418c2512
--- lams_tool_lamc/web/authoring/editQuestionBox.jsp	(.../editQuestionBox.jsp)	(revision 8e97adb8dda2f984a9b43f71eacd9a5033244bff)
+++ lams_tool_lamc/web/authoring/editQuestionBox.jsp	(.../editQuestionBox.jsp)	(revision 05c00f92856ef13cd90d6fce06acb069418c2512)
@@ -204,7 +204,7 @@
 			</div>
 
 			<div class="pull-right">
-				<a href="#" onclick="javascript:self.parent.tb_remove();" onmousedown="self.focus();" class="btn btn-default btn-sm roffset5"> 
+				<a href="#" onclick="javascript:self.parent.tb_remove();" onmousedown="self.focus();" class="btn btn-default btn-sm roffset5"  id="eqbCancel"> 
 					<fmt:message key="label.cancel" />
 				</a>
 				<a href="#" onclick="javascript:saveQuestion();"
Index: lams_tool_lamc/web/authoring/itemlist.jsp
===================================================================
diff -u -r49901ad0cfdc24e4a7c6458e5977dab0f6ef19ff -r05c00f92856ef13cd90d6fce06acb069418c2512
--- lams_tool_lamc/web/authoring/itemlist.jsp	(.../itemlist.jsp)	(revision 49901ad0cfdc24e4a7c6458e5977dab0f6ef19ff)
+++ lams_tool_lamc/web/authoring/itemlist.jsp	(.../itemlist.jsp)	(revision 05c00f92856ef13cd90d6fce06acb069418c2512)
@@ -32,7 +32,7 @@
 		<i class="fa fa-spinner" style="display: none" id="itemArea_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 href="#nogo" id="importQTILink"  onClick="javascript:importQTI()" class="btn btn-default" id="importQTI">
 					<fmt:message key="label.authoring.import.qti" />
 				</a>
 			</c:if>
Index: lams_tool_scratchie/web/pages/authoring/parts/itemlist.jsp
===================================================================
diff -u -r98fb8bd4f3c36bbdcfe9b9445757f685d972cc02 -r05c00f92856ef13cd90d6fce06acb069418c2512
--- lams_tool_scratchie/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision 98fb8bd4f3c36bbdcfe9b9445757f685d972cc02)
+++ lams_tool_scratchie/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision 05c00f92856ef13cd90d6fce06acb069418c2512)
@@ -28,7 +28,7 @@
 <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 href="#" id="importQTILink" onClick="javascript:importQTI();return false;" class="btn btn-default btn-xs loffset5">
 				<fmt:message key="label.authoring.import.qti" /> 
 			</a>
 		</div>