Index: lams_monitoring/web/dummyDetail.jsp
===================================================================
diff -u -r04ddbcceec831fcb71c1c9d160300569ac1547f6 -r058a658862a0da5d133d61816f18bf0dfe2b356b
--- lams_monitoring/web/dummyDetail.jsp	(.../dummyDetail.jsp)	(revision 04ddbcceec831fcb71c1c9d160300569ac1547f6)
+++ lams_monitoring/web/dummyDetail.jsp	(.../dummyDetail.jsp)	(revision 058a658862a0da5d133d61816f18bf0dfe2b356b)
@@ -27,6 +27,9 @@
     <H1>Lesson Management</H1>
     
 	<H2>Lesson Details: <c:out value="${lesson.lessonName}"/></H2>
+
+	<p>If you want to participate in the lesson as a student, or view the portfolio as if you were a student, please use the learner screen.</p>
+
 	<TABLE border="0" summary="This table is being used for layout purposes only">
 		<TR>
 			<TD class="formlabel">Lesson Id:</TD>
@@ -55,16 +58,9 @@
 	<p>All the links below should pop-up in new windows.</p>
 	<TABLE border="0" summary="This table is being used for layout purposes only">
 		<TR>
-			<TD class="formcontrol" colspan="3"><A HREF=javascript:launchPopup('/lams/learning/exportWaitingPage.jsp?mode=teacher&lessonID=<c:out value="${lesson.lessonId}"/>');>Export Portfolio for all users</a></TD>
+			<TD class="formcontrol" colspan="3"><A HREF=javascript:launchPopup('/lams/learning/exportWaitingPage.jsp?mode=teacher&lessonID=<c:out value="${lesson.lessonId}"/>');>Export Portfolio for all users</a> </TD>
 		</TR>
 		<TR>
-			<TD class="formcontrol" colspan="3"><A HREF=javascript:launchPopup('/lams/learning/exportWaitingPage.jsp?mode=learner&lessonID=<c:out value="${lesson.lessonId}"/>');>Export Portfolio as <lams:user property="login"/></a>
-		</TR>
-		
-		<TR>
-			<TD class="formcontrol" colspan="3"><A HREF=javascript:launchPopup('/lams/learning/learner.do?method=joinLesson&userId=<lams:user property="userID"/>&lessonId=<c:out value="${lesson.lessonId}"/>');>Join Lesson as <lams:user property="login"/></a>
-		</TR>
-		<TR>
 			<TD class="formcontrol" colspan="3">&nbsp;
 		</TR>
 
Index: lams_monitoring/web/dummyStart.jsp
===================================================================
diff -u -r04ddbcceec831fcb71c1c9d160300569ac1547f6 -r058a658862a0da5d133d61816f18bf0dfe2b356b
--- lams_monitoring/web/dummyStart.jsp	(.../dummyStart.jsp)	(revision 04ddbcceec831fcb71c1c9d160300569ac1547f6)
+++ lams_monitoring/web/dummyStart.jsp	(.../dummyStart.jsp)	(revision 058a658862a0da5d133d61816f18bf0dfe2b356b)
@@ -54,7 +54,7 @@
 			<select name="organisationId">
 				<c:forEach items="${organisations}" var="org">
 					<option value="<c:out value="${org.organisationId}"/>"><c:out value="${org.name}"/>
-						(<c:forEach items="${org.users}" var="user"><c:out value="${user.login}"/></c:forEach>)
+						(<c:forEach items="${org.users}" var="user"  varStatus="status"><c:out value="${user.login}"/><c:if test="${not status.last}">,</c:if></c:forEach>)
 					</option>
 				</c:forEach>
 			</select>