Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java
===================================================================
diff -u -rf92865513dd2beca642af28ab42096ee4849ac32 -re5ac63b3c8f4c12996668e9efa54e9aaf50d69df
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java	(.../MonitoringAction.java)	(revision f92865513dd2beca642af28ab42096ee4849ac32)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java	(.../MonitoringAction.java)	(revision e5ac63b3c8f4c12996668e9efa54e9aaf50d69df)
@@ -1072,10 +1072,6 @@
 				currentActivity))) {
 		    JSONObject learnerJSON = WebUtil.userToJSON(learner);
 		    Long currentActivityId = currentActivity.getActivityId();
-		    // monitoring URL for the given learner
-		    String learnerUrl = monitoringService.getLearnerActivityURL(lessonId, currentActivityId,
-			    learner.getUserId(), monitorUserId);
-		    learnerJSON.put("url", learnerUrl);
 
 		    Activity parentActivity = currentActivity.getParentActivity();
 		    Long targetActivityId = (branchingActivityId != null) || (parentActivity == null)
@@ -1319,7 +1315,9 @@
 	    IMonitoringService monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet()
 		    .getServletContext());
 	    // URL in monitor mode
-	    url = monitoringService.getLearnerActivityURL(lessonId, activity.getActivityId(), learnerId, monitorId);
+	    url = Configuration.get(ConfigurationKeys.SERVER_URL)
+		    + "monitoring/monitoring.do?method=getLearnerActivityURL&lessonID=" + lessonId + "&activityID="
+		    + activity.getActivityId() + "&userID=" + learnerId;
 	}
 
 	if (url != null) {
@@ -1328,7 +1326,7 @@
 	    }
 	    String serverUrl = Configuration.get(ConfigurationKeys.SERVER_URL);
 	    if (!url.startsWith(serverUrl)) {
-		// monitor mode URLs should be prepended with serve URL
+		// monitor mode URLs should be prepended with server URL
 		url = serverUrl + url;
 	    }
 	    activityJSON.put("url", url);
Index: lams_monitoring/web/css/monitorLesson.css
===================================================================
diff -u -r1d8bb6927b7d4341f8f5111179e53e1b1ee40d88 -re5ac63b3c8f4c12996668e9efa54e9aaf50d69df
--- lams_monitoring/web/css/monitorLesson.css	(.../monitorLesson.css)	(revision 1d8bb6927b7d4341f8f5111179e53e1b1ee40d88)
+++ lams_monitoring/web/css/monitorLesson.css	(.../monitorLesson.css)	(revision e5ac63b3c8f4c12996668e9efa54e9aaf50d69df)
@@ -225,10 +225,6 @@
 	vertical-align: middle;
 }
 
-#tabLearnerControlTable td.topButtonsContainer {
-	width: 90px;
-}
-
 td.learnersHeaderPageCell,td.learnersPageShifter {
 	min-width: 25px;
 	cursor: pointer;
Index: lams_monitoring/web/includes/javascript/monitorLesson.js
===================================================================
diff -u -re588f8b0835c3723796e010a59d23cb0b6a073df -re5ac63b3c8f4c12996668e9efa54e9aaf50d69df
--- lams_monitoring/web/includes/javascript/monitorLesson.js	(.../monitorLesson.js)	(revision e588f8b0835c3723796e010a59d23cb0b6a073df)
+++ lams_monitoring/web/includes/javascript/monitorLesson.js	(.../monitorLesson.js)	(revision e5ac63b3c8f4c12996668e9efa54e9aaf50d69df)
@@ -534,8 +534,7 @@
 			            		var selectedLearner = $('#learnerGroupList div.dialogListItemSelected');
 			            		if (selectedLearner.length == 1) {
 			            			// open pop up with user progress in the given activity
-			            			openPopUp(LAMS_URL 
-			            					+ selectedLearner.attr('viewUrl'), "LearnActivity", 600, 800, true);
+			            			openPopUp(selectedLearner.attr('viewUrl'), "LearnActivity", 600, 800, true);
 			            		}
 							}
 			             },
@@ -909,7 +908,9 @@
 			learnerIcon.dblclick(function(event){
 				 // double click on learner icon to see activity from his perspective
 				event.stopPropagation();
-				openPopUp(LAMS_URL + learner.url, "LearnActivity", 600, 800, true);
+				var url = LAMS_URL + 'monitoring/monitoring.do?method=getLearnerActivityURL&userID=' 
+					               + learner.id + '&activityID=' + activity.id + '&lessonID=' + lessonId;
+				openPopUp(url, "LearnActivity", 600, 800, true);
 			});
 		}
 	});
@@ -945,7 +946,7 @@
 		// create learner icons, along with handlers
 		$.each(learners, function(learnerIndex, learner){
 			// maximum 41 icons in the bar
-			if (learners.length > 43 && learnerIndex == 42) {
+			if (learners.length > 56 && learnerIndex == 55) {
 				// if icons do not fit in cell anymore, show a group icon
 				$('<img />').attr({
 					'src' : LAMS_URL + 'images/icons/group.png',
@@ -1401,9 +1402,11 @@
 	
 	if (learners) {
 		$.each(learners, function(learnerIndex, learner) {
+			var viewUrl = LAMS_URL + 'monitoring/monitoring.do?method=getLearnerActivityURL&userID=' 
+            				       + learner.id + '&activityID=' + activityId + '&lessonID' + lessonId;
 			var learnerDiv = $('<div />').attr({
 									'userId'  : learner.id,
-									'viewUrl'    : learner.url
+									'viewUrl'    : viewUrl
 									})
 			                      .addClass('dialogListItem')
 							      .text(getLearnerDisplayName(learner))
@@ -1422,7 +1425,7 @@
 				if (allowView){
 					learnerDiv.dblclick(function(){
 						// same as clicking View Learner button
-						openPopUp(LAMS_URL + learner.url, "LearnActivity", 600, 800, true);
+						openPopUp(viewUrl, "LearnActivity", 600, 800, true);
 					});
 				}
 			}