Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/LearningAction.java
===================================================================
diff -u -r4060c9d9376555e5c015b4d20656d121069f4f0d -r216faf48cfe263a39e62f3ffd4a9f1203348ed53
--- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/LearningAction.java	(.../LearningAction.java)	(revision 4060c9d9376555e5c015b4d20656d121069f4f0d)
+++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/LearningAction.java	(.../LearningAction.java)	(revision 216faf48cfe263a39e62f3ffd4a9f1203348ed53)
@@ -755,6 +755,9 @@
 		    entry.setLastModified(new Date());
 		    mindmapService.updateEntry(entry);
 		}
+	    } else {
+		if (!mindmap.isMultiUserMode())
+		    saveMindmapXML(mindmap, mindmapUser, learningForm.getMindmapContent());
 	    }
 
 	} else {
Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/MonitoringAction.java
===================================================================
diff -u -r4060c9d9376555e5c015b4d20656d121069f4f0d -r216faf48cfe263a39e62f3ffd4a9f1203348ed53
--- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/MonitoringAction.java	(.../MonitoringAction.java)	(revision 4060c9d9376555e5c015b4d20656d121069f4f0d)
+++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/MonitoringAction.java	(.../MonitoringAction.java)	(revision 216faf48cfe263a39e62f3ffd4a9f1203348ed53)
@@ -44,7 +44,6 @@
 import org.lamsfoundation.lams.tool.mindmap.service.MindmapServiceProxy;
 import org.lamsfoundation.lams.tool.mindmap.util.xmlmodel.NodeConceptModel;
 import org.lamsfoundation.lams.tool.mindmap.util.xmlmodel.NodeModel;
-import org.lamsfoundation.lams.tool.mindmap.web.forms.MonitoringForm;
 import org.lamsfoundation.lams.util.Configuration;
 import org.lamsfoundation.lams.util.ConfigurationKeys;
 import org.lamsfoundation.lams.util.WebUtil;
Index: lams_tool_mindmap/web/images/mindmap_locked.swf
===================================================================
diff -u -r7e4617a3b7ad93cf9a3393de07a576579b237aad -r216faf48cfe263a39e62f3ffd4a9f1203348ed53
Binary files differ
Index: lams_tool_mindmap/web/images/mindmap_multiuser.swf
===================================================================
diff -u -r7e4617a3b7ad93cf9a3393de07a576579b237aad -r216faf48cfe263a39e62f3ffd4a9f1203348ed53
Binary files differ
Index: lams_tool_mindmap/web/images/mindmap_singleuser.swf
===================================================================
diff -u -r7e4617a3b7ad93cf9a3393de07a576579b237aad -r216faf48cfe263a39e62f3ffd4a9f1203348ed53
Binary files differ
Index: lams_tool_mindmap/web/includes/javascript/authoring.js
===================================================================
diff -u -r26ce6de9fba8494203a85a4ce076b6ffea4238ed -r216faf48cfe263a39e62f3ffd4a9f1203348ed53
--- lams_tool_mindmap/web/includes/javascript/authoring.js	(.../authoring.js)	(revision 26ce6de9fba8494203a85a4ce076b6ffea4238ed)
+++ lams_tool_mindmap/web/includes/javascript/authoring.js	(.../authoring.js)	(revision 216faf48cfe263a39e62f3ffd4a9f1203348ed53)
@@ -22,7 +22,7 @@
 	
 	if (tag.value == "" || tag.value == 1) {
 		flashvars["xml"] = "";
-		embedFlashObject();
+		embedFlashObject(700, 525);
 	}
 	
 	selectTab(tabId);
Index: lams_tool_mindmap/web/pages/learning/mindmap.jsp
===================================================================
diff -u -r324f94f5410569681a4a4d831d2d8023804c971b -r216faf48cfe263a39e62f3ffd4a9f1203348ed53
--- lams_tool_mindmap/web/pages/learning/mindmap.jsp	(.../mindmap.jsp)	(revision 324f94f5410569681a4a4d831d2d8023804c971b)
+++ lams_tool_mindmap/web/pages/learning/mindmap.jsp	(.../mindmap.jsp)	(revision 216faf48cfe263a39e62f3ffd4a9f1203348ed53)
@@ -14,6 +14,9 @@
 	}
 
 	function submitForm(methodName) {
+		// Sets mindmap content in Flash
+		setMindmapContent();
+
  	 	var f = document.getElementById('submitForm');
  		f.submit();
 	}
@@ -30,9 +33,6 @@
 		// Validates that there's input from the user. 
 		// disables the Finish button to avoid double submittion 
 		disableFinishButton();
-
-		// Sets mindmap content in Flash
-		setMindmapContent();
 	}
 	
 	flashvars = { xml: "${mindmapContentPath}", user: "${currentMindmapUser}", 
@@ -57,7 +57,7 @@
 
 	$(window).resize(makeNice);
 
-	function makeNice(){
+	function makeNice() {
 		flash = document.getElementById('flashContent');
 		container = document.getElementById('container');
 		flash.style.width = container.clientWidth+"px";
@@ -96,6 +96,7 @@
 		<html:hidden property="userId" value="${userIdParam}" />
 		<html:hidden property="toolContentId" value="${toolContentIdParam}" />
 		<html:hidden property="toolSessionID" />
+		<html:hidden property="mindmapContent" styleId="mindmapContent" />
 		
 		<c:choose>
 			<c:when test="${reflectOnActivity}">
@@ -106,7 +107,6 @@
 			</c:otherwise>
 		</c:choose>
 		
-		<html:hidden property="mindmapContent" styleId="mindmapContent" />
 		<c:set var="lrnForm" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 
 		<center id="container">
@@ -118,9 +118,9 @@
 		<c:choose>
 			<c:when test="${reflectOnActivity}">
 				<div class="space-bottom-top align-right">
-					<html:submit styleClass="button" styleId="finishButton">
-						<fmt:message>button.continue</fmt:message>
-					</html:submit>
+					<html:link href="javascript:;" styleClass="button" styleId="finishButton" onclick="submitForm('finish')">
+						<span class="nextActivity"><fmt:message>button.continue</fmt:message></span>
+					</html:link>
 				</div>
 			</c:when>
 		
Index: lams_tool_mindmap/web/pages/monitoring/editActivity.jsp
===================================================================
diff -u -r42d5fe8f0e027f1dc279d2583dade23c7898ef0f -r216faf48cfe263a39e62f3ffd4a9f1203348ed53
--- lams_tool_mindmap/web/pages/monitoring/editActivity.jsp	(.../editActivity.jsp)	(revision 42d5fe8f0e027f1dc279d2583dade23c7898ef0f)
+++ lams_tool_mindmap/web/pages/monitoring/editActivity.jsp	(.../editActivity.jsp)	(revision 216faf48cfe263a39e62f3ffd4a9f1203348ed53)
@@ -2,11 +2,11 @@
 
 <c:set var="dto" value="${mindmapDTO}" />
 
-<c:if test="${dto.contentInUse}">
+<!--<c:if test="${dto.contentInUse}">
 	<p class="warning">
 		<fmt:message key="message.alertContentEdit" />
 	</p>
-</c:if>
+</c:if> -->
 
 <table cellspacing="0">
 	<tbody>