Index: lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/web/servlets/ExportServlet.java
===================================================================
diff -u -re81fdf5aa1e9c04fd0b7a624d8b8419b13cac81a -r16f19684cdc9d508fab563581a9d12e823f8804d
--- lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/web/servlets/ExportServlet.java	(.../ExportServlet.java)	(revision e81fdf5aa1e9c04fd0b7a624d8b8419b13cac81a)
+++ lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/web/servlets/ExportServlet.java	(.../ExportServlet.java)	(revision 16f19684cdc9d508fab563581a9d12e823f8804d)
@@ -25,15 +25,12 @@
 
 package org.lamsfoundation.lams.tool.wookie.web.servlets;
 
-import java.util.ArrayList;
-
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
-import org.lamsfoundation.lams.learning.export.web.action.CustomToolImageBundler;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
@@ -47,6 +44,7 @@
 import org.lamsfoundation.lams.tool.wookie.service.WookieServiceProxy;
 import org.lamsfoundation.lams.tool.wookie.util.WookieConstants;
 import org.lamsfoundation.lams.tool.wookie.util.WookieException;
+import org.lamsfoundation.lams.tool.wookie.util.WookieUtil;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.web.servlet.AbstractExportPortfolioServlet;
 import org.lamsfoundation.lams.web.session.SessionManager;
@@ -165,15 +163,10 @@
 	    imageFileArray[1] = userDTO.getImageFileName();
 	}
 	
-	// bundling the images in export
-	try {
-	    CustomToolImageBundler imageBundler = new CustomToolImageBundler();
-	    imageBundler.bundle(request, cookies, directoryName, WookieConstants.LAMS_WWW_PIXLR_FOLDER_URL, imageFileArray);
-	} catch (Exception e) {
-	    logger.error("Could not export gmap images, some images may be missing in export portfolio", e);
-	}
-	
-	request.getSession().setAttribute("userDTO", userDTO);
+	request.getSession().setAttribute("userWidgetURL", wookieUser.getUserWidgetURL());
+	request.getSession().setAttribute("widgetHeight", wookieSession.getWidgetHeight());
+	request.getSession().setAttribute("widgetWidth", wookieSession.getWidgetWidth());
+	request.getSession().setAttribute("widgetMaximise", wookieSession.getWidgetMaximise());
 	request.getSession().setAttribute("wookieDTO", wookieDTO);
     }
 
@@ -193,11 +186,14 @@
 
 	WookieDTO wookieDTO = new WookieDTO(wookie);
 	
-
 	
 	for (WookieSessionDTO sessionDTO : wookieDTO.getSessionDTOs()) {
 	    Long toolSessionID = sessionDTO.getSessionID();
 	   
+	    // Initiate the wookie widget for the monitor
+	    String sessionUserWidgetUrl = initiateWidget(sessionDTO.getWidgetIdentifier(), sessionDTO.getWidgetSharedDataKey());
+	    sessionDTO.setSessionUserWidgetUrl(sessionUserWidgetUrl);
+	    
 	    for (WookieUserDTO userDTO : sessionDTO.getUserDTOs()) {
 		// get the notebook entry.
 		NotebookEntry notebookEntry = wookieService.getEntry(toolSessionID, CoreNotebookConstants.NOTEBOOK_TOOL,
@@ -209,7 +205,36 @@
 		
 	    }
 	}
+	
+	// Set a flag if there is only one session 
+	boolean multipleSessionFlag = false;
+	if (wookieDTO.getSessionDTOs() != null && wookieDTO.getSessionDTOs().size() > 1) {
+	    multipleSessionFlag = true;
+	}
+	request.setAttribute("multipleSessionFlag", multipleSessionFlag);
+	
 	request.getSession().setAttribute("wookieDTO", wookieDTO);
     }
+    
+    private String initiateWidget(String wookieIdentifier, String sharedDataKey) throws WookieException {
+	try {
 
+	    String wookieUrl = wookieService.getWookieURL();
+	    String wookieKey = wookieService.getWookieAPIKey();
+
+	    wookieUrl += WookieConstants.RELATIVE_URL_WIDGET_SERVICE;
+
+	    String returnXML = WookieUtil.getWidget(wookieUrl, wookieKey, wookieIdentifier, getUser(), sharedDataKey, true);
+	    return  WookieUtil.getWidgetUrlFromXML(returnXML);
+
+	} catch (Exception e) {
+	    logger.error("Problem intitating widget for learner" + e);
+	    throw new WookieException(e);
+	}
+    }
+    
+    private UserDTO getUser() {
+	return (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER);
+    }
+
 }
Index: lams_tool_wookie/web/pages/export/exportPortfolio.jsp
===================================================================
diff -u -r857f9a4afbdb784f3cd9508d1eeec864e368f221 -r16f19684cdc9d508fab563581a9d12e823f8804d
--- lams_tool_wookie/web/pages/export/exportPortfolio.jsp	(.../exportPortfolio.jsp)	(revision 857f9a4afbdb784f3cd9508d1eeec864e368f221)
+++ lams_tool_wookie/web/pages/export/exportPortfolio.jsp	(.../exportPortfolio.jsp)	(revision 16f19684cdc9d508fab563581a9d12e823f8804d)
@@ -43,39 +43,129 @@
 <c:choose>
 	<c:when test='${mode == "teacher"}'>
 
-		<h2><fmt:message key="title.sessions" /></h2>
+		
+		<c:if test="${multipleSessionFlag}">
+			<h2><fmt:message key="title.sessions" /></h2>
 
-		<!-- Set up the anchor links -->
-		<div id="sessionContents">
-		<ul>
-			<c:forEach var="session" items="${wookieDTO.sessionDTOs}">
-				<li><a href="#sid-${session.sessionID}">${session.sessionName}</a>
-				</li>
-			</c:forEach>
-		</ul>
-		</div>
+			<!-- Set up the anchor links -->
+			<div id="sessionContents">
+			<ul>
+				<c:forEach var="session" items="${wookieDTO.sessionDTOs}">
+					<li><a href="#sid-${session.sessionID}">${session.sessionName}</a>
+					</li>
+				</c:forEach>
+			</ul>
+			</div>
+			<br />
+			<hr>
+			<br />
+		</c:if>
 
-		<hr>
-
 		<c:forEach var="session" items="${wookieDTO.sessionDTOs}">
 			<div id="sid-${session.sessionID}">
-			<h3>${session.sessionName}</h3>
+				<c:if test="${multipleSessionFlag}">
+				<h3>
+					${session.sessionName}
+				</h3>
+				</c:if>
 
-
-				<c:forEach var="user" items="${session.userDTOs}">
+				<table cellpadding="0">
+					<tr>
+						<td class="field-name" width="30%">
+							<fmt:message key="heading.totalLearners" />
+						</td>
+						<td width="70%">
+							${session.numberOfLearners}
+						</td>
+					</tr>
+				</table>
+				<table width="100%">
+					<tr align="center">
+						<td>
+							<iframe
+									id="widgetIframe"
+									src="${session.sessionUserWidgetUrl}" 
+									name="widgetIframe"
+									style="width:${session.widgetWidth}px;height:${session.widgetHeight}px;border:0px;" 
+									frameborder="no"
+									scrolling="no"
+									>
+							</iframe>
+						</td>
+					</tr>
+				</table>
+		
+				<c:if test="${wookieDTO.reflectOnActivity}">
+					<br />
 					
-				</c:forEach>
+					<h3> <fmt:message key="monitoring.reflections" /></h3>
+					
+					<table cellpadding="0" class="alternative-color">
+						<tr>
+							<th><fmt:message key="monitoring.th.learner" /></th>
+							
+							<th><fmt:message key="monitoring.th.reflection" /></th>
+							
+						</tr>
+						
+						<c:forEach var="user" items="${session.userDTOs}">
+							<tr>
+								<td>
+									${user.firstName} ${user.lastName}
+								</td>
+								
+									<td >
+										<c:choose>
+											<c:when test="${user.finishedReflection}">
+												${user.notebookEntry}
+											</c:when>
+											<c:otherwise>
+												<fmt:message key="label.notAvailable" />
+											</c:otherwise>
+										</c:choose>
+									</td>
+							</tr>
+						</c:forEach>
+					</table>
+				</c:if>
+				
+				<br /> 
+				<br />
 			</div>
 		</c:forEach>
-
 	</c:when>
 	<c:otherwise>
 		<br />
 		<h2>
 			${userDTO.firstName} ${userDTO.lastName}
 		</h2>
 		
+		<c:choose>
+			<c:when test="${wookieDTO.lockOnFinish}">
+				<div class="info">
+					<fmt:message key="export.portfolio.contentlocked" />
+				</div>
+			</c:when>
+			<c:otherwise>
+				<table width="100%" height>
+					<tr align="center">
+						<td>
+							<iframe
+									id="widgetIframe"
+									src="${userWidgetURL}" 
+									name="widgetIframe"
+									style="width:${widgetWidth}px;height:${widgetHeight}px;border:0px;" 
+									frameborder="no"
+									scrolling="no"
+									>
+							</iframe>
+						</td>
+					</tr>
+				</table>
+			</c:otherwise>
+		</c:choose>
 		
+		
 		<c:if test="${wookieDTO.reflectOnActivity}">
 			<h2>
 				<fmt:message key="monitoring.th.reflection" />