Index: lams_central/web/css/authoring-svg.css
===================================================================
diff -u -r2004cd28f4e47531a37d161b113806665a3aa345 -rd23cfe73ee8a02bac48ce02552b1041bb3d3b9f6
--- lams_central/web/css/authoring-svg.css	(.../authoring-svg.css)	(revision 2004cd28f4e47531a37d161b113806665a3aa345)
+++ lams_central/web/css/authoring-svg.css	(.../authoring-svg.css)	(revision d23cfe73ee8a02bac48ce02552b1041bb3d3b9f6)
@@ -49,7 +49,7 @@
 	fill: #e9f9c0;
 }
 
-.svg-tool-activity-title-label {
+.svg-activity-title-label {
 	font-size   : 16px;
 	font-family : sans-serif;
 }
@@ -64,11 +64,10 @@
 	text-align: center;
 }
 
-.svg-tool-activity-title-label.svg-tool-activity-title-label-small {
+.svg-activity-title-label.svg-activity-title-label-small {
 	font-size   : 12px;
 }
 
-
 .svg-branching {
 	stroke-width: 3;
 	fill: white;
Index: lams_central/web/includes/javascript/authoring/authoringActivity.js
===================================================================
diff -u -r2004cd28f4e47531a37d161b113806665a3aa345 -rd23cfe73ee8a02bac48ce02552b1041bb3d3b9f6
--- lams_central/web/includes/javascript/authoring/authoringActivity.js	(.../authoringActivity.js)	(revision 2004cd28f4e47531a37d161b113806665a3aa345)
+++ lams_central/web/includes/javascript/authoring/authoringActivity.js	(.../authoringActivity.js)	(revision d23cfe73ee8a02bac48ce02552b1041bb3d3b9f6)
@@ -358,7 +358,7 @@
 		});
 	
 		this.items = paper.g(shape, icon);
-		this.items.addClass('svg-activity-branching');
+		this.items.addClass('svg-activity svg-activity-branching');
 		if (this.readOnly && !isReadOnlyMode) {
 			this.items.attr('filter', layout.conf.readOnlyFilter);
 		}
@@ -426,7 +426,7 @@
 		}
 		
 		this.items.data('parentObject', this);
-		this.items.addClass('svg-activity-floating svg-shadow');
+		this.items.addClass('svg-activity svg-activity-floating svg-shadow');
 	},
 	
 	
@@ -456,7 +456,7 @@
 		});
 
 		this.items = paper.g(shape);
-		this.items.addClass('svg-activity-gate svg-shadow');
+		this.items.addClass('svg-activity svg-activity-gate svg-shadow');
 		if (this.readOnly && !isReadOnlyMode) {
 			this.items.attr('filter', layout.conf.readOnlyFilter);
 		}
@@ -523,7 +523,7 @@
 			'data-height': height
 		});
 		
-		this.items.addClass('svg-activity-grouping');
+		this.items.addClass('svg-activity svg-activity-grouping');
 		if (this.readOnly && !isReadOnlyMode) {
 			this.items.attr('filter', layout.conf.readOnlyFilter);
 		}
@@ -593,7 +593,7 @@
 		}
 		
 		this.items.data('parentObject', this);
-		this.items.addClass('svg-activity-optional svg-shadow');
+		this.items.addClass('svg-activity svg-activity-optional svg-shadow');
 		this.items.attr({
 			'uiid'   : this.uiid,
 			'data-x' : x,
@@ -660,7 +660,7 @@
 		}
 		
 		this.items.data('parentObject', this);
-		this.items.addClass('svg-activity-parallel svg-shadow');
+		this.items.addClass('svg-activity svg-activity-parallel svg-shadow');
 		this.items.attr({
 			'uiid'   : this.uiid,
 			'data-x' : x,
@@ -732,7 +732,7 @@
 			'data-width' : width,
 			'data-height': height
 		});
-        this.items.addClass('svg-activity-tool');
+        this.items.addClass('svg-activity svg-activity-tool');
 		this.items.shape = shape;
 		
 		if (this.grouping) {
@@ -1896,7 +1896,7 @@
 		if (title.length > 35) {
 			title = title.substring(0, 35) + '...';
 		}
-		var label = $('<div />').addClass('svg-tool-activity-title-label svg-tool-activity-title-box').text(title),
+		var label = $('<div />').addClass('svg-activity-title-label svg-tool-activity-title-box').text(title),
 			wrapper = $('<foreignObject />').append(label).attr({
 				'x'     : x + 75,
 				'y'     : y,
Index: lams_central/web/includes/javascript/authoring/authoringDecoration.js
===================================================================
diff -u -r4dcd8a2830858a519b2ef998de23e0041fff9145 -rd23cfe73ee8a02bac48ce02552b1041bb3d3b9f6
--- lams_central/web/includes/javascript/authoring/authoringDecoration.js	(.../authoringDecoration.js)	(revision 4dcd8a2830858a519b2ef998de23e0041fff9145)
+++ lams_central/web/includes/javascript/authoring/authoringDecoration.js	(.../authoringDecoration.js)	(revision d23cfe73ee8a02bac48ce02552b1041bb3d3b9f6)
@@ -84,8 +84,7 @@
 				this.items.attr('uiid', this.uiid);
 				if (this.title) {
 					var label = paper.text(x + 7, y + 14, this.title)
-									 .attr(layout.defaultTextAttributes)
-					 				 .attr('text-anchor', 'start');
+									 .addClass('svg-activity-title-label svg-activity-title-label-small');
 					if (!isReadOnlyMode){
 						label.attr('cursor', 'pointer');
 					}
Index: lams_monitoring/web/includes/javascript/monitorLesson.js
===================================================================
diff -u -r2004cd28f4e47531a37d161b113806665a3aa345 -rd23cfe73ee8a02bac48ce02552b1041bb3d3b9f6
--- lams_monitoring/web/includes/javascript/monitorLesson.js	(.../monitorLesson.js)	(revision 2004cd28f4e47531a37d161b113806665a3aa345)
+++ lams_monitoring/web/includes/javascript/monitorLesson.js	(.../monitorLesson.js)	(revision d23cfe73ee8a02bac48ce02552b1041bb3d3b9f6)
@@ -1406,7 +1406,7 @@
 		// otherwise it is a list of selected learners IDs
 		moveAll = learners === true;
 	// check all activities and "users who finished lesson" bar
-	$('g[id]:not([id*="_to_"])', sequenceCanvas).add('#completedLearnersContainer').each(function(){
+	$('g.svg-activity', sequenceCanvas).add('#completedLearnersContainer').each(function(){
 		// find which activity learner was dropped on
 		var act = $(this),
 			coord = {
@@ -1432,13 +1432,13 @@
 	});
 	
 	$.each(foundActivities, function(){
-		if (this.attr('class') == 'floating') {
+		if (this.hasClass('svg-activity-floating')) {
 			// no force complete to support activities
 			targetActivity = null;
 			return false;
 		}
 		// the enveloping OptionalActivity has priority
-		if (targetActivity == null || this.attr('class') == 'optional') {
+		if (targetActivity == null || this.hasClass('svg-activity-optional')) {
 			targetActivity = this;
 		}
 	});
@@ -1466,7 +1466,7 @@
 	} else {
 		var targetActivityId = +targetActivity.attr('id');
 		if (currentActivityId != targetActivityId) {
-			var targetActivityName = targetActivity.attr('class') == 'gate' ? "Gate" : targetActivity.children('text').text(),
+			var targetActivityName = targetActivity.hasClass('svg-activity-gate') ? "Gate" : targetActivity.find('.svg-activity-title-label').text(),
 				moveBackwards = currentActivityId == null;
 			
 			// check if target activity is before current activity
@@ -1598,6 +1598,7 @@
 							.css({
 								'position' : 'absolute'
 							})
+							.attr('id', 'act' + activity.id + 'learnerGroup')
 							.addClass('more-learner-icon')
 							: null,
 		learningDesignSvgViewbox = learningDesignSvg.attr('viewBox').split(' '),
@@ -1619,13 +1620,13 @@
 				'height': '30px'
 			});
 			
-			$('.svg-tool-activity-title-label', activityGroup).parent('foreignObject').remove();
+			$('.svg-activity-title-label', activityGroup).parent('foreignObject').remove();
 			$('<text>').text(activity.title.length < 20 ? activity.title : activity.title.substring(0, 20) + '...')
 					   .attr({
 							'x' : coord.x + 55,
 							'y' : coord.y + 20
 						})
-						.addClass('svg-tool-activity-title-label svg-tool-activity-title-label-small')
+						.addClass('svg-activity-title-label svg-activity-title-label-small')
 						.appendTo(activityGroup);
 	
 			$.each(activity.learners, function(learnerIndex, learner){
@@ -1652,7 +1653,6 @@
 			
 			if (activity.learnerCount > 8) {
 				allLearnersIcon
-					  .attr('id', 'act' + activity.id + 'learnerGroup')
 					  .css({
 						'left'     : activityLeftOffset + 138 + 'px',
 						'top'      : activityTopOffset  - 60  + 'px',