Index: lams_central/src/java/org/lamsfoundation/lams/authoring/web/ExportToolContentController.java
===================================================================
diff -u -re1f8d81e7d43745977ce6b8679f0595203b77d7a -r0d0ccac606a59f73ed3209901b1d7d98371fb4be
--- lams_central/src/java/org/lamsfoundation/lams/authoring/web/ExportToolContentController.java	(.../ExportToolContentController.java)	(revision e1f8d81e7d43745977ce6b8679f0595203b77d7a)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/web/ExportToolContentController.java	(.../ExportToolContentController.java)	(revision 0d0ccac606a59f73ed3209901b1d7d98371fb4be)
@@ -42,6 +42,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
 
 /**
  * Export tool content action. It needs learingDesignID as input parameter.
@@ -60,27 +61,10 @@
 
     private Logger log = Logger.getLogger(ExportToolContentController.class);
 
-    @RequestMapping("/authoring/exportToolContent")
-    public String execute(HttpServletRequest request, HttpServletResponse response) throws Exception {
-	String param = request.getParameter("method");
-	// -----------------------Resource Author function ---------------------------
-	if (StringUtils.equals(param, "loading")) {
-	    Long learningDesignId = WebUtil.readLongParam(request, ExportToolContentController.PARAM_LEARING_DESIGN_ID);
-	    request.setAttribute(ExportToolContentController.PARAM_LEARING_DESIGN_ID, learningDesignId);
-	    // display initial page for automatically loading download pgm
-	    return "toolcontent/exportloading";
-	} else if (StringUtils.equals(param, "export")) {
-	    // the export LD pgm
-	    return exportLD(request, response);
-	} else { // choice format
-	    Long learningDesignId = WebUtil.readLongParam(request, ExportToolContentController.PARAM_LEARING_DESIGN_ID);
-	    request.setAttribute(ExportToolContentController.PARAM_LEARING_DESIGN_ID, learningDesignId);
-	    // display choose IMS or LAMS format page
-	    return "toolcontent/exportchoice";
-	}
-    }
 
-    private String exportLD(HttpServletRequest request, HttpServletResponse response) {
+    @RequestMapping("/authoring/exportToolContent/export")
+    @ResponseBody
+    private void exportLD(HttpServletRequest request, HttpServletResponse response) {
 	Long learningDesignId = WebUtil.readLongParam(request, ExportToolContentController.PARAM_LEARING_DESIGN_ID);
 	List<String> ldErrorMsgs = new ArrayList<>();
 	List<String> toolsErrorMsgs = new ArrayList<>();
@@ -135,14 +119,12 @@
 		}
 	    }
 
-	    return null;
 	} catch (Exception e1) {
 	    log.error("Unable to export tool content: " + e1.toString());
 	    ldErrorMsgs.add(0, e1.getClass().getName());
 	    request.setAttribute(ExportToolContentController.ATTR_LD_ERROR_MESSAGE, ldErrorMsgs);
 	    request.setAttribute(ExportToolContentController.ATTR_TOOLS_ERROR_MESSAGE, toolsErrorMsgs);
 	}
 	// display initial page for upload
-	return "toolcontent/exportresult";
     }
 }
Index: lams_learning/web/branching/preview.jsp
===================================================================
diff -u -rb546f3a46de916721f4d729ac1b0e64cc1eb9cb4 -r0d0ccac606a59f73ed3209901b1d7d98371fb4be
--- lams_learning/web/branching/preview.jsp	(.../preview.jsp)	(revision b546f3a46de916721f4d729ac1b0e64cc1eb9cb4)
+++ lams_learning/web/branching/preview.jsp	(.../preview.jsp)	(revision 0d0ccac606a59f73ed3209901b1d7d98371fb4be)
@@ -29,8 +29,8 @@
 		<title><fmt:message key="label.branching.title"/></title>
 		<lams:css/>
 		<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/jquery.js"></script>
-		<c:set var="formAction">/branching/performBranching.do?type=${BranchingForm.map.type}&activityID=${BranchingForm.map.activityID}&progressID=${BranchingForm.map.progressID}</c:set>
-		<c:if test="${BranchingForm.map.previewLesson == true}">
+		<c:set var="formAction">/branching/performBranching.do?type=${BranchingForm.type}&activityID=${BranchingForm.activityID}&progressID=${BranchingForm.progressID}</c:set>
+		<c:if test="${BranchingForm.previewLesson == true}">
 			<c:set var="formAction"><c:out value="${formAction}"/>&amp;force=true</c:set>
 		</c:if>
 		<META HTTP-EQUIV="Refresh" CONTENT="60;URL=<lams:WebAppURL/>${formAction}">
@@ -65,7 +65,7 @@
 			}
 		</script>
 		
-		<c:set var="title"><c:out value="${BranchingForm.map.title}" /></c:set>
+		<c:set var="title"><c:out value="${BranchingForm.title}" /></c:set>
 		<lams:Page type="learner" title="${title}">
 		
 			<p>
@@ -75,11 +75,11 @@
 			<div class="group-box">
 		
 				<form:form
-					action="branching/forceBranching.do?amp;type=${BranchingForm.map.type}&amp;activityID=${BranchingForm.map.activityID}&amp;progressID=${BranchingForm.map.progressID}"
+					action="forceBranching.do?amp;type=${BranchingForm.type}&amp;activityID=${BranchingForm.activityID}&amp;progressID=${BranchingForm.progressID}"
 					modelAttribute="BranchingForm" target="_self" onsubmit="return validate();">
 		
 					<table class="table table-condensed table-striped">
-						<c:forEach items="${BranchingForm.map.activityURLs}"
+						<c:forEach items="${BranchingForm.activityURLs}"
 							var="activityURL" varStatus="loop">
 							<tr>
 								<td width="2%">
Index: lams_learning/web/branching/wait.jsp
===================================================================
diff -u -rb546f3a46de916721f4d729ac1b0e64cc1eb9cb4 -r0d0ccac606a59f73ed3209901b1d7d98371fb4be
--- lams_learning/web/branching/wait.jsp	(.../wait.jsp)	(revision b546f3a46de916721f4d729ac1b0e64cc1eb9cb4)
+++ lams_learning/web/branching/wait.jsp	(.../wait.jsp)	(revision 0d0ccac606a59f73ed3209901b1d7d98371fb4be)
@@ -29,20 +29,20 @@
 		<title><fmt:message key="label.branching.title"/></title>
 		<lams:css/>
 		<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/jquery.js"></script>
-		<c:set var="formAction">/branching/performBranching.do?type=${BranchingForm.map.type}&activityID=${BranchingForm.map.activityID}&progressID=${BranchingForm.map.progressID}</c:set>
-		<c:if test="${BranchingForm.map.previewLesson == true}">
+		<c:set var="formAction">/branching/performBranching.do?type=${BranchingForm.type}&activityID=${BranchingForm.activityID}&progressID=${BranchingForm.progressID}</c:set>
+		<c:if test="${BranchingForm.previewLesson == true}">
 			<c:set var="formAction"><c:out value="${formAction}"/>&amp;force=true</c:set>
 		</c:if>
 		<META HTTP-EQUIV="Refresh" CONTENT="60;URL=<lams:WebAppURL/>${formAction}">
 	  </lams:head>
 
 	<body class="stripes">
 	
-		<c:set var="formAction">/branching/performBranching.do?type=${BranchingForm.map.type}&activityID=${BranchingForm.map.activityID}&progressID=${BranchingForm.map.progressID}</c:set>
+		<c:set var="formAction">/branching/performBranching.do?type=${BranchingForm.type}&activityID=${BranchingForm.activityID}&progressID=${BranchingForm.progressID}</c:set>
 	
 		<form:form action="${formAction}" modelAttribute="BranchingForm" target="_self">
 	
-			<c:set var="title"><c:out value="${BranchingForm.map.title}" /></c:set>
+			<c:set var="title"><c:out value="${BranchingForm.title}" /></c:set>
 			<lams:Page type="learner" title="${title}">
 	
 				<p><fmt:message key="label.branching.wait.message"/></p>