Index: lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java
===================================================================
diff -u -rfe06d16b234341fc965d9b40494e6a2fb4cb9438 -r3d15dc37d0cc6e60d522cc9e5671bbbe8d017596
--- lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java	(.../HomeAction.java)	(revision fe06d16b234341fc965d9b40494e6a2fb4cb9438)
+++ lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java	(.../HomeAction.java)	(revision 3d15dc37d0cc6e60d522cc9e5671bbbe8d017596)
@@ -34,6 +34,7 @@
 import java.util.TreeSet;
 import java.util.Vector;
 
+import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -178,38 +179,10 @@
 		    return displayMessage(mapping, req, "error.lesson.not.accessible.for.learners");
 		}
 		
-		if (lesson.getLearnerRestart()) {
-		    // start the lesson from the beginning each time
-		    getLessonService().removeLearnerProgress(lessonId, user.getUserID());
-		}
-		
-
-		String learnerURL = Configuration.get(ConfigurationKeys.SERVER_URL) + "learning/main.jsp";
-
-		if (mode != null) {
-		    learnerURL = WebUtil.appendParameterToURL(learnerURL, AttributeNames.PARAM_MODE, mode);
-		}
-
-		learnerURL = WebUtil.appendParameterToURL(learnerURL, AttributeNames.PARAM_EXPORT_PORTFOLIO_ENABLED,
-			String.valueOf(lesson.getLearnerExportAvailable() != null ? lesson.getLearnerExportAvailable()
-				: Boolean.TRUE));
-		learnerURL = WebUtil.appendParameterToURL(learnerURL, AttributeNames.PARAM_PRESENCE_ENABLED,
-			String.valueOf(lesson.getLearnerPresenceAvailable()));
-		learnerURL = WebUtil.appendParameterToURL(learnerURL, AttributeNames.PARAM_PRESENCE_IM_ENABLED,
-			String.valueOf(lesson.getLearnerImAvailable()));
-		learnerURL = WebUtil.appendParameterToURL(learnerURL, AttributeNames.PARAM_TITLE,
-			URLEncoder.encode(lesson.getLessonName(), "UTF8"));
-
-		/* Date Format for Chat room append */
-		DateFormat sfm = new SimpleDateFormat("yyyyMMdd_HHmmss");
-		learnerURL = WebUtil.appendParameterToURL(learnerURL, AttributeNames.PARAM_CREATE_DATE_TIME,
-			sfm.format(lesson.getCreateDateTime()));
-		learnerURL = WebUtil.appendParameterToURL(learnerURL, AttributeNames.PARAM_LESSON_ID,
-			String.valueOf(lessonId));
-
-		// show lesson intro page if required
-		if (lesson.isEnableLessonIntro()) {
-		    req.setAttribute("learnerURL", learnerURL);
+		// show lesson intro page if required and it's not been shown already
+		boolean isLessonIntroWatched = WebUtil.readBooleanParam(req, "isLessonIntroWatched", false);
+		if (lesson.isEnableLessonIntro() && !isLessonIntroWatched) {
+		    req.setAttribute("learnerURL", "learnerURL");
 		    req.setAttribute("lesson", lesson);
 		    req.setAttribute("displayDesignImage", lesson.isDisplayDesignImage());
 		    req.setAttribute("isMonitor", lesson.getLessonClass().isStaffMember(getRealUser(user)));
@@ -228,11 +201,37 @@
 			}
 		    }
 		    return mapping.findForward("lessonIntro");
-		} else {
-		    res.setCharacterEncoding("UTF-8");
-		    res.sendRedirect(learnerURL);
-		    return null;
 		}
+		
+		if (lesson.getLearnerRestart()) {
+		    // start the lesson from the beginning each time
+		    getLessonService().removeLearnerProgress(lessonId, user.getUserID());
+		}
+		
+		if (mode != null) {
+		    req.setAttribute(AttributeNames.PARAM_MODE, mode);
+		}
+
+		req.setAttribute(AttributeNames.PARAM_LESSON_ID, String.valueOf(lessonId));
+		req.setAttribute(AttributeNames.PARAM_EXPORT_PORTFOLIO_ENABLED, String.valueOf(lesson
+			.getLearnerExportAvailable() != null ? lesson.getLearnerExportAvailable() : Boolean.TRUE));
+		req.setAttribute(AttributeNames.PARAM_PRESENCE_ENABLED,
+			String.valueOf(lesson.getLearnerPresenceAvailable()));
+		req.setAttribute(AttributeNames.PARAM_PRESENCE_IM_ENABLED,
+			String.valueOf(lesson.getLearnerImAvailable()));
+		req.setAttribute(AttributeNames.PARAM_TITLE, URLEncoder.encode(lesson.getLessonName(), "UTF8"));
+
+		/* Date Format for Chat room append */
+		DateFormat sfm = new SimpleDateFormat("yyyyMMdd_HHmmss");
+		req.setAttribute(AttributeNames.PARAM_CREATE_DATE_TIME, sfm.format(lesson.getCreateDateTime()));
+		
+		//forward to /lams/learning/main.jsp
+		String serverURLContextPath = Configuration.get(ConfigurationKeys.SERVER_URL_CONTEXT_PATH);
+		serverURLContextPath = serverURLContextPath.startsWith("/") ? serverURLContextPath : "/" + serverURLContextPath;
+		serverURLContextPath += serverURLContextPath.endsWith("/") ? "" : "/";
+		getServlet().getServletContext().getContext(serverURLContextPath + "learning")
+			.getRequestDispatcher("/main.jsp").forward(req, res);
+		return null;
 	    }
 
 	} catch (Exception e) {
Index: lams_central/web/lessonIntro.jsp
===================================================================
diff -u -r738c1ec90176394b826038af57ed7afeab3c76d5 -r3d15dc37d0cc6e60d522cc9e5671bbbe8d017596
--- lams_central/web/lessonIntro.jsp	(.../lessonIntro.jsp)	(revision 738c1ec90176394b826038af57ed7afeab3c76d5)
+++ lams_central/web/lessonIntro.jsp	(.../lessonIntro.jsp)	(revision 3d15dc37d0cc6e60d522cc9e5671bbbe8d017596)
@@ -61,7 +61,7 @@
 		</c:if>
 			
 		<div class="space-bottom-top align-right">
-			<html:link href="${fn:escapeXml(learnerURL)}" styleClass="button">
+			<html:link href="${lams}home.do?method=learner&lessonID=${lesson.lessonId}&isLessonIntroWatched=true" styleClass="button">
 				<span class="nextActivity"><fmt:message key="label.start.lesson" /></span>
 			</html:link>
 		</div>
Index: lams_learning/web/main.jsp
===================================================================
diff -u -ra9c3b10fe6ab6645945c0bacbae5892f499fd352 -r3d15dc37d0cc6e60d522cc9e5671bbbe8d017596
--- lams_learning/web/main.jsp	(.../main.jsp)	(revision a9c3b10fe6ab6645945c0bacbae5892f499fd352)
+++ lams_learning/web/main.jsp	(.../main.jsp)	(revision 3d15dc37d0cc6e60d522cc9e5671bbbe8d017596)
@@ -34,19 +34,19 @@
 <lams:html>
 <lams:head>
 	<lams:css />
-	<link href="css/main.css" rel="stylesheet" type="text/css" />
+	<link href="<c:url value="/"/>css/main.css" rel="stylesheet" type="text/css" />
 	<link href="<lams:LAMSURL/>css/progressBar.css" rel="stylesheet" type="text/css" />
 
 	<title><fmt:message key="learner.title" /></title>
 
-	<c:if test="${not empty param.notifyCloseURL}">
-		<c:set var="notifyCloseURL" value="${param.notifyCloseURL}" scope="request" />
+	<c:if test="${not empty notifyCloseURL}">
+		<c:set var="notifyCloseURL" value="${notifyCloseURL}" scope="request" />
 	</c:if>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.form.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.layout.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/raphael/raphael.js"></script>
-	<script type="text/javascript" src="includes/javascript/main.js"></script>
+	<script type="text/javascript" src="<c:url value="/"/>includes/javascript/main.js"></script>
 	<script type="text/javascript">
 		var LAMS_URL = '<lams:LAMSURL/>',
 			APP_URL = LAMS_URL + 'learning/',
@@ -60,11 +60,11 @@
 			},
 			
 			parentURL = "${notifyCloseURL}",
-			lessonId = '${param.lessonID}',
+			lessonId = '${lessonID}',
 			progressPanelEnabled = '<lams:Configuration key="LearnerCollapsProgressPanel" />' != 'false',
 			
 			// settings for progress bar
-			presenceEnabled = '${param.presenceEnabledPatch}' != 'false',
+			presenceEnabled = '${presenceEnabledPatch}' != 'false',
 			isHorizontalBar = false,
 			hasContentFrame = true,
 			hasDialog = false,
@@ -136,14 +136,14 @@
 			</tr>
 			<tr>
 				<td id="exportButtonCell">
-					<c:if test="${param.portfolioEnabled}">
+					<c:if test="${portfolioEnabled}">
 						<input onClick="javascript:exportPortfolio()" type="button" class="button progressButton" value='<fmt:message key="button.export" />' />
 					</c:if>
 				</td>
 			</tr>
 		</table>
 		
-		<div id="lessonTitleRow" class="separatorRow progressStaticHeight"><c:out value="${param.title}" /></div>
+		<div id="lessonTitleRow" class="separatorRow progressStaticHeight"><c:out value="${title}" /></div>
 		
 		<div id="progressBarDiv" class="progressBarContainer"></div>
 		
@@ -160,7 +160,7 @@
 			<span id="notebookTogglerCell" class="togglerCell"/>▲</span>
 		</div>
 		<form id="notebookForm" action="<lams:WebAppURL />notebook.do?method=processNewEntry" method="post">
-			<input type="hidden" name="lessonID" value="${param.lessonID}" />
+			<input type="hidden" name="lessonID" value="${lessonID}" />
 			<input type="hidden" name="signature" value="SCRATCHPAD" />
 			<input type="hidden" name="skipViewAll" value="true" />
 			
@@ -191,21 +191,21 @@
 		</form>
 	</div>
 
-	<c:if test="${param.presenceEnabledPatch}">
+	<c:if test="${presenceEnabledPatch}">
 		<%@ include file="presenceChat.jsp"%>
 	</c:if>
 
 	<c:choose>
 		<c:when test="${isTouchInterface}">
 			<div id="content-frame-container" class="ui-layout-center">
 				<iframe id="contentFrame" name="contentFrame" onload="javascript:fillProgressBar('learnerMainBar')" 
-					src="content.do?lessonID=<c:out value="${param.lessonID}"/>"> </iframe>
+					src="<c:url value="/"/>content.do?lessonID=<c:out value="${lessonID}"/>"> </iframe>
 			</div>
 		</c:when>
 		
 		<c:otherwise>
 			<iframe id="contentFrame" name="contentFrame" onload="javascript:fillProgressBar('learnerMainBar')" class="ui-layout-center"
-				src="content.do?lessonID=<c:out value="${param.lessonID}"/>"> </iframe>
+				src="<c:url value="/"/>content.do?lessonID=<c:out value="${lessonID}"/>"> </iframe>
 		</c:otherwise>
 	</c:choose>