Index: lams_monitoring/web/monitorTour.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r6f1fed4f14cf4217a48f7b4a0f31d77f280d542c
--- lams_monitoring/web/monitorTour.jsp	(.../monitorTour.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_monitoring/web/monitorTour.jsp	(.../monitorTour.jsp)	(revision 6f1fed4f14cf4217a48f7b4a0f31d77f280d542c)
@@ -3,23 +3,24 @@
 	function startTour() {
 
 		var selectedTabID = getCurrentTabID();
-		var startStep = 0;
+		var startStep;
 		if ( selectedTabID == 2 ) {
-			startStep = 10;
+			startStep = 15;
 		} else if ( selectedTabID == 3 ) {
-			startStep = 18;
+			startStep = 23;
 		}  else if ( selectedTabID == 4 ) {
-			startStep = 24;
+			startStep = 29;
 		}
 
 		tourInProgress = true;
 		$('.tour-button').prop('disabled', true);
 
 		if ( tour == null ) {
 			tour = new Tour({
+			  framework: "bootstrap3",
 			  name: "LAMSMonitorTour",
 		      steps: [
-		          {
+		          {  // 0
 			        title: "<fmt:message key="tour.intro.title"/>",
 			        content: "<fmt:message key="tour.intro.content"/>",
 			        orphan: true
@@ -38,12 +39,12 @@
 			        title: "<fmt:message key="summery.desc.lbl"/>",
 			        content: "<fmt:message key="tour.lesson.description"/>",
 			        placement: "bottom",
-			      },{
+			      },{ 
 			        element: "#lessonStateLabel:first-child",
 			        title: "<fmt:message key="lesson.state"/>",
 			        content: "<p><fmt:message key="tour.lesson.state.content.1"/></p><p><fmt:message key="tour.lesson.state.content.2"/></p><p><fmt:message key="tour.lesson.state.content.3"/></p><p><fmt:message key="tour.lesson.state.content.4"/></p><p><fmt:message key="tour.lesson.state.content.5"/></p>",
 			        placement: "right",
-			      },{
+			      },{  // 5
 			        element: "#tour-learner-count",
 			        title: "<fmt:message key="lesson.learners"/>",
 			        content: "<p><fmt:message key="tour.lesson.count.learners.content.1"/></p><p><fmt:message key="tour.lesson.count.learners.content.2"/></p>",
@@ -63,12 +64,12 @@
 			        title: "<fmt:message key="email.notifications"/>",
 			        content: "<fmt:message key="tour.email.notifications.content"/>",
 			        placement: "top",
-			      },{
+			      },{   
 			        element: "#editIntroButton",
 			        title: "<fmt:message key="label.lesson.introduction"/>",
 			        content: "<fmt:message key="tour.edit.lesson.introduction"/>",
 			        placement: "top",
-			      },{
+			      },{  // 10
 			        element: "#gradebookOnCompleteButton",
 			        title: "<fmt:message key="label.display.activity.scores"/>",
 			        content: "<fmt:message key="tour.display.activity.scores.content"/>",
@@ -90,16 +91,17 @@
 			        title: "<fmt:message key="tour.progress.email.configure.title"/>",
 			        content: "<fmt:message key="tour.progress.email.confure.content"/>",
 			        placement: "bottom"
-			      },{
+			      },{ 
 			        element: "#chartDiv",
 			        title: "<fmt:message key="lesson.chart.title"/>",
 			        content: "<fmt:message key="tour.completion.chart.content"/>",
 			        placement: "left",
 			        onNext: switchToSequence
-			      },{
+			      },{   // 15
 			      	title: "<fmt:message key="tab.sequence"/>",
 			        content: "<fmt:message key="tour.tab.sequence.content"/>",
 			        orphan: true,
+					delayOnElement:	{ delayElement: "#sequenceTopButtonsContainer", maxDelay: 2000 },
 			        onPrev: switchToLesson
 			      },{
 			        element: "#sequenceCanvas",
@@ -119,41 +121,43 @@
 			        content: "<fmt:message key="tour.move.learners.affect.content"/>",
 			        placement: "top",
 			        backdrop: true
-			      },{
+			      },{ 
 			        element: "#sequenceCanvas",
 			        title: "<fmt:message key="tour.move.learners.title"/>",
 			        content: "<fmt:message key="tour.move.learners.large.content"/>",
 			        placement: "top",
 			        backdrop: true
-			      },{
+			      },{ // 20
 			        element: "#completedLearnersContainer",
 			        title: "<fmt:message key="tour.completed.learners.title"/>",
 			        content: "<fmt:message key="tour.completed.learners.content"/>",
 			        placement: "top",
 			        backdrop: true
 			      },{
-			        element: "#sequenceSearchPhrase",
-			        title: "<fmt:message key="tour.learner.search.title"/>",
-			        content: "<fmt:message key="tour.learner.search.content"/>",
-			        placement: "bottom",
-			      },{
 			        element: "#liveEditButton",
 			        title: "<fmt:message key="tour.live.edit.title"/>",
 			        content: "<fmt:message key="tour.live.edit.content"/>",
-			        placement: "left",
-			        onNext: switchToLearners
+			        placement: "left"
 			      },{
+			        element: "#sequenceSearchPhrase",
+			        title: "<fmt:message key="tour.learner.search.title"/>",
+			        content: "<fmt:message key="tour.learner.search.content"/>",
+					delayOnElement:	{ delayElement: "element", maxDelay: 2000 },
+			        onNext: switchToLearners,
+			        placement: "bottom"
+			      },{
 			        title: "<fmt:message key="tab.learners"/>",
 			        content: "<fmt:message key="tour.tab.learners.content"/>",
 			        orphan: true,
+					delayOnElement:	{ delayElement: "#tabLearnerControlTable", maxDelay: 2000 },
 			        onPrev: switchToSequence
-			      },{
+			      },{ 
 			        element: "#tabLearnersContainer",
 			        title: "<fmt:message key="tab.learners"/>",
 			        content: "<p><fmt:message key="tour.learners.progress.content.1"/></p><p><fmt:message key="tour.learners.progress.content.2"/></p><p><fmt:message key="tour.learners.progress.content.3"/></p>",
 			        placement: "top",
 			        backdrop: true,
-			      },{
+			      },{  // 25
 			        element: "#learnersSearchPhrase",
 			        title: "<fmt:message key="tour.learner.search.title"/>",
 			        content: "<fmt:message key="tour.learner.search.content"/>",
@@ -173,14 +177,16 @@
 			        title: "<fmt:message key="label.email"/>",
 			        content: "<fmt:message key="tour.email.content"/>",
 			        placement: "left",
+			        delayOnElement:	{ delayElement: "element", maxDelay: 2000 },
 			        onNext: switchToGradebook
-			      },{
+			      },{ 
 			        element: "#userView",
 			        title: "<fmt:message key="tour.gradebook.learner.grades"/>",
 			        content: "<fmt:message key="tour.gradebook.learner.grades.content"/>",
 			        placement: "top",
+			        delayOnElement:	{ delayElement: "#gradebookTopButtonsContainer", maxDelay: 2000 },
 			        onPrev: switchToLearners
-			      },{
+			      },{ // 30
 			        element: "#activityView",
 			        title: "<fmt:message key="tour.gradebook.activity.grades"/>",
 			        content: "<fmt:message key="tour.gradebook.activity.grades.content"/>",
@@ -201,14 +207,14 @@
 			        content: "<fmt:message key="tour.gradebook.show.marks.chart.content"/>",
 			        placement: "bottom",
 			        onNext: showMarkChart
-			      },{
+			      },{  
 			        element: "#markChartDiv",
 			        title: "<fmt:message key="tour.gradebook.marks.chart"/>",
 			        content: "<fmt:message key="tour.histogram.help.content"/>",
 			        backdrop: true,
 			        placement: "top",
 			        onNext: hideMarkChart
-			      },{
+			      },{ // 35
 			        element: "#tour-weight-button",
 			        title: "<fmt:message key="tour.gradebook.show.weight"/>",
 			        content: "<fmt:message key="tour.gradebook.show.weight.content"/>",
@@ -220,7 +226,7 @@
 			        content: "<fmt:message key="tour.gradebook.show.dates.content"/>",
 			        placement: "bottom",
 			        onPrev: showMarkChart
-			      },{
+			      },{  // 37
 					title: "<fmt:message key="tour.end.title"/>",
 			        content: "<p><fmt:message key="tour.end.content.1"/></p><p><fmt:message key="tour.end.content.2"/></p>",
 			        placement: "top",
@@ -231,17 +237,23 @@
 			  debug: true,
 			  backdrop: false,
 			  storage: false,
-			  template: '<div class="popover" role="tooltip"> <div class="arrow"></div> <h3 class="popover-title"></h3> <div class="popover-content"></div> <div class="popover-navigation"> <div class="btn-group"> <button class="btn btn-sm btn-default" data-role="prev">&laquo; <fmt:message key="tour.prev"/></button> <button class="btn btn-sm btn-default" data-role="next"><fmt:message key="tour.next"/> &raquo;</button> </div> <button class="btn btn-sm btn-default loffset5" onclick="openWikiHelp()"><fmt:message key="tour.more.help"/></button>  <button class="btn btn-sm btn-default" data-role="end"><fmt:message key="tour.end.tour"/></button> </div>'
+			  showProgressText: false,
+			  showProgressBar: true,
+			  sanitizeWhitelist:	{ "button"	: ["data-morehelp"] },
+			  template: '<div class="popover" role="tooltip"> <div class="arrow"></div> <h3 class="popover-title"></h3> <div class="popover-content"></div> <div class="popover-navigation"> <div class="btn-group"> <button class="btn btn-sm btn-default" data-role="prev">&laquo; <fmt:message key="tour.prev"/></button> <button class="btn btn-sm btn-default" data-role="next"><fmt:message key="tour.next"/> &raquo;</button> </div> <button data-morehelp="true" class="btn btn-sm btn-default loffset5 morehelp"><fmt:message key="tour.more.help"/></button>  <button class="btn btn-sm btn-default" data-role="end"><fmt:message key="tour.end.tour"/></button> </div>'
 			  
 			});
 
-		    tour.init();
 		    tour.start(true);
 
 		} else {
 			tour.restart();
 		}
-		tour.goTo(startStep);
+		if ( startStep ) {
+			tour.goTo(startStep);
+		}
+		
+		$("body").on("click","button.morehelp", openWikiHelp);
 	}
 	
  	function revealIM(tour) { 
@@ -298,8 +310,6 @@
 	function switchToGradebook() {
 		actualDoSelectTab(4);
 		var check = 0;
-		
-		"#gradebookLoading"
 	}
 	
 	function tourEnd() {