Index: lams_central/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r3f18890e24de43c31ac23d49e2c1a4906e479863 -r5d865502ffc41ad5759af87eb091d9627e6965a1
--- lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 3f18890e24de43c31ac23d49e2c1a4906e479863)
+++ lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 5d865502ffc41ad5759af87eb091d9627e6965a1)
@@ -851,8 +851,8 @@
 authoring.error.numlearners  =Number of learners must be 1 to 99.
 authoring.error.group.data  =Group settings are not correct.
 authoring.section.lessondetails  =Lesson Details
-authoring.section.questions  =Questions
-authoring.section.applicationexercise  =Application Exercise
+authoring.section.questions  =RAT Questions
+authoring.section.applicationexercise  =Application Exercises
 authoring.section.introduction  =Introduction
 authoring.create.question  =Create Question
 authoring.create.essay.question  =Create Essay Question
@@ -876,7 +876,7 @@
 authoring.label.none  =None
 authoring.tbl.template.title  =Team Based Learning
 authoring.tbl.template.description  =Individual and Team Readiness Assessments followed by Application Exercises.
-authoring.tbl.desc.question  =These questions are for iRA and tRA. Click "Create Question" to add more questions. Turn on "Enable confidence levels" to have the learners' confidence levels from the iRA shown on the tRA screen.
+authoring.tbl.desc.question  =These questions are for IRA and TRA. Click "Create Question" to add more questions. Turn on "Enable confidence levels" to have the learners' confidence levels from the iRA shown on the tRA screen.
 authoring.tbl.desc.ae  =State the questions for AE. Click "Create Question" to add more questions.
 authoring.template.basic.import.qti  =Import IMS QTI
 
Index: lams_central/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r427b1699f540858bcf2d07288f0f5be431e8881b -r5d865502ffc41ad5759af87eb091d9627e6965a1
--- lams_central/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 427b1699f540858bcf2d07288f0f5be431e8881b)
+++ lams_central/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 5d865502ffc41ad5759af87eb091d9627e6965a1)
@@ -851,14 +851,15 @@
 authoring.error.numlearners  =Number of learners must be 1 to 99.
 authoring.error.group.data  =Group settings are not correct.
 authoring.section.lessondetails  =Lesson Details
-authoring.section.questions  =Questions
-authoring.section.applicationexercise  =Application Exercise
+authoring.section.questions  =RAT Questions
+authoring.section.applicationexercise  =Application Exercises
 authoring.section.introduction  =Introduction
 authoring.create.question  =Create Question
 authoring.create.essay.question  =Create Essay Question
 authoring.create.mc.question  =Create Multiple Choice Question
 authoring.label.application.exercise.num  =Application Exercise {0}
 authoring.error.application.exercise.num  =Application Exercise {0} may not be blank.
+authoring.label.question.text  =Question text
 authoring.label.question.num  =Question {0}
 authoring.label.option.num  =Option {0}
 authoring.error.option  =Option may not be blank
@@ -869,15 +870,16 @@
 button.return.to.template.list  =Go back to Template list
 authoring.error.content.id  =Content ID is missing
 authoring.error.question.must.have.answer.num  =Question {0} must have at least one answer.
-authoring.error.application.exercise.must.have.answer.num  =Application Exercise {0} must have at least one answer.
-authoring.error.application.exercise.must.have.100.percent  =Application Exercise {0} must have at least one answer worth 100%.
-authoring.error.application.exercise.not.blank.and.grade  =Application Exercise {0} may not be blank and must have a grade.
+authoring.error.application.exercise.question.must.not.be.blank.num =Application Exercise {0} Question {1} may not be blank.
+authoring.error.application.exercise.must.have.answer.num  =Application Exercise {0} Question {1} must have at least one answer.
+authoring.error.application.exercise.must.have.100.percent  =Application Exercise {0} Question {1} must have at least one answer worth 100%.
+authoring.error.application.exercise.not.blank.and.grade  =Application Exercise {0} Question {1} may not be blank and must have a grade.
 authoring.label.grade  =Grade
 authoring.label.none  =None
 authoring.tbl.template.title  =Team Based Learning
 authoring.tbl.template.description  =Individual and Team Readiness Assessments followed by Application Exercises.
 authoring.tbl.desc.question  =These questions are for iRA and tRA. Click "Create Question" to add more questions. Turn on "Enable confidence levels" to have the learners' confidence levels from the iRA shown on the tRA screen.
-authoring.tbl.desc.ae  =State the questions for AE. Click "Create Question" to add more questions.
-
-
+authoring.tbl.desc.ae  =Enter the questions for the Application Exercises. You can have one or more Application Exercises and each Application Exercise can have one or more Questions. If you turn on Add A Notebook for the Application Exercise then a Notebook activity will be created after that Application Exercise. 
+authoring.tbl.use.notebook=Add a Notebook after the Application Exercise with the following instructions:
+authoring.create.application.exercise=Create Application Exercise
 #======= End labels: Exported 872 labels for en AU =====
Index: lams_central/conf/language/lams/TBLResources.properties
===================================================================
diff -u -r3f18890e24de43c31ac23d49e2c1a4906e479863 -r5d865502ffc41ad5759af87eb091d9627e6965a1
--- lams_central/conf/language/lams/TBLResources.properties	(.../TBLResources.properties)	(revision 3f18890e24de43c31ac23d49e2c1a4906e479863)
+++ lams_central/conf/language/lams/TBLResources.properties	(.../TBLResources.properties)	(revision 5d865502ffc41ad5759af87eb091d9627e6965a1)
@@ -1,20 +1,25 @@
 boilerplate.introduction.title=Introduction to TBL
 boilerplate.introduction.instructions=<p>You would have gone through pre-class activities designated by your instructor. <BR/>\
-You would form groups before completing the Individual Readiness Assessment (iRA). You would then attempt the Team Readiness Assessment (tRA), where your group leader would submit the group's answer. <BR/>\
+You would form groups before completing the Individual Readiness Assessment (IRA). You would then attempt the Team Readiness Assessment (TRA), where your group leader would submit the group's answer. <BR/>\
 Next, your group would complete the application exercises. <BR/>\
 As a post-class activity, you would complete a personal reflection on the key learning points. </P>
-boilerplate.ira.title=iRA Test
-boilerplate.ira.instructions=Please complete the MCQ before proceed to the next activity
+boilerplate.ira.title=IRA
+boilerplate.ira.instructions=Please complete the MCQ before proceeding to the next activity.
 boilerplate.leader.title=Leader Selection
 boilerplate.leader.instructions=Instructions
-boilerplate.tra.title=tRA Test
-boilerplate.tra.instructions=Please give your input on what the answer given by your peer
-boilerplate.ae.instructions=Instructions to students
-boilerplate.ae.application.exercise.num=Application Exercise {0}
+boilerplate.tra.title=Scratchie / TRA
+boilerplate.tra.instructions=Please give your input based on the answers given by your peers.
+boilerplate.ae.instructions=
+boilerplate.ae.application.exercise.num=Assessment / AE {0}
+boilerplate.ae.question.num  =Question {0}
+boilerplate.grouped.notebook.num=Notebook for Assessment / AE {0}
 boilerplate.individual.reflection.title=Notebook
 boilerplate.individual.reflection.instructions=What are your key learning points?
 boilerplate.peerreview=Peer Review
 boilerplate.peerreview.instructions=Please rate your peers' interaction with the group.
-boilerplate.before.ira.gate=Gate for iRA Test
-boilerplate.before.tra.gate=Gate for tRA Test
-boilerplate.before.app.ex=Gate for Application Exercise(s)
\ No newline at end of file
+boilerplate.before.ira.gate=Gate for IRA
+boilerplate.before.tra.gate=Gate for TRA
+boilerplate.before.app.ex=Gate for Application Exercise
+boilerplate.before.app.ex.notebook=Gate for Notebook
+boilerplate.before.peer.review=Gate for Peer Review
+boilerplate.grouping.title=Group Setup
Index: lams_central/src/java/org/lamsfoundation/lams/authoring/template/Assessment.java
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r5d865502ffc41ad5759af87eb091d9627e6965a1
--- lams_central/src/java/org/lamsfoundation/lams/authoring/template/Assessment.java	(.../Assessment.java)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/template/Assessment.java	(.../Assessment.java)	(revision 5d865502ffc41ad5759af87eb091d9627e6965a1)
@@ -129,16 +129,16 @@
     }
 
     /** If no errors exist, returns null */
-    public List<String> validate(ResourceBundle appBundle, MessageFormat formatter, Integer questionNumber) {
+    public List<String> validate(ResourceBundle appBundle, MessageFormat formatter, Integer applicationExerciseNumber, Integer questionNumber) {
 	List<String> errorMessages = null;
 	if (questionText == null || questionText.length() == 0) {
 	    errorMessages = addError(errorMessages, TextUtil.getText(appBundle, formatter,
-		    "authoring.error.application.exercise.num", new Object[] { questionNumber }));
+		    "authoring.error.application.exercise.question.must.not.be.blank.num", new Object[] { questionNumber }));
 	}
 	if (type == ASSESSMENT_QUESTION_TYPE_MULTIPLE_CHOICE) {
 	    if (answers.size() == 0) {
 		errorMessages = addError(errorMessages, TextUtil.getText(appBundle, formatter,
-			"authoring.error.application.exercise.must.have.answer.num", new Object[] { questionNumber }));
+			"authoring.error.application.exercise.must.have.answer.num", new Object[] { applicationExerciseNumber, questionNumber }));
 	    } else {
 		boolean found100percent = false;
 		for (AssessMCAnswer answer : answers) {
@@ -151,7 +151,7 @@
 		    errorMessages = addError(errorMessages,
 			    TextUtil.getText(appBundle, formatter,
 				    "authoring.error.application.exercise.must.have.100.percent",
-				    new Object[] { questionNumber }));
+				    new Object[] { applicationExerciseNumber, questionNumber }));
 		}
 	    }
 	}
Index: lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java
===================================================================
diff -u -r3f18890e24de43c31ac23d49e2c1a4906e479863 -r5d865502ffc41ad5759af87eb091d9627e6965a1
--- lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java	(.../LdTemplateController.java)	(revision 3f18890e24de43c31ac23d49e2c1a4906e479863)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java	(.../LdTemplateController.java)	(revision 5d865502ffc41ad5759af87eb091d9627e6965a1)
@@ -753,12 +753,12 @@
      * to be expanded.
      */
     protected Long createAssessmentToolContent(UserDTO user, String title, String instructions,
-	    String reflectionInstructions, boolean selectLeaderToolOutput, ArrayNode questions) throws IOException {
+	    String reflectionInstructions, boolean selectLeaderToolOutput, boolean enableNumbering, ArrayNode questions) throws IOException {
 
 	ObjectNode toolContentJSON = createStandardToolContent(title, instructions, reflectionInstructions, null, null,
 		user);
 	toolContentJSON.put(RestTags.USE_SELECT_LEADER_TOOL_OUTPUT, selectLeaderToolOutput);
-
+	toolContentJSON.put("numbered", enableNumbering);
 	toolContentJSON.set(RestTags.QUESTIONS, questions);
 
 	ArrayNode references = JsonNodeFactory.instance.arrayNode();
@@ -961,12 +961,13 @@
      * details of questions). Other fields are optional.
      */
     protected Long createMCQToolContent(UserDTO user, String title, String instructions,
-	    boolean useSelectLeaderToolOuput, boolean enableConfidenceLevel, ArrayNode questions) throws IOException {
+	    boolean useSelectLeaderToolOuput, boolean enableConfidenceLevel, boolean prefixAnswersWithLetters, ArrayNode questions) throws IOException {
 
 	ObjectNode toolContentJSON = createStandardToolContent(title, instructions, null, null, null, null);
 	toolContentJSON.put(RestTags.USE_SELECT_LEADER_TOOL_OUTPUT, useSelectLeaderToolOuput);
 	toolContentJSON.set(RestTags.QUESTIONS, questions);
 	toolContentJSON.put(RestTags.ENABLE_CONFIDENCE_LEVELS, enableConfidenceLevel);
+	toolContentJSON.put("prefixAnswersWithLetters", prefixAnswersWithLetters);
 	return createToolContent(user, LdTemplateController.MCQ_TOOL_SIGNATURE, toolContentJSON);
     }
 
@@ -1324,6 +1325,7 @@
     @RequestMapping("/createAssessment")
     public String createAssessment(HttpServletRequest request) {
 	request.setAttribute("questionNumber", WebUtil.readIntParam(request, "questionNumber"));
+	request.setAttribute("containingDivName", WebUtil.readStrParam(request, "containingDivName", true));
 
 	String questionType = WebUtil.readStrParam(request, "questionType");
 	if (questionType == null || !questionType.equalsIgnoreCase("mcq")) {
@@ -1334,13 +1336,15 @@
 
     }
 
-    @RequestMapping("/importQTI")
+  @RequestMapping("/importQTI")
     public String importAssessmentQTI(HttpServletRequest request) throws UnsupportedEncodingException {
 	String contentFolderID = WebUtil.readStrParam(request, "contentFolderID");
 	String templatePage = WebUtil.readStrParam(request, "templatePage");
 	Question[] updatedQuestions = preprocessQuestions(QuestionParser.parseQuestionChoiceForm(request), contentFolderID);
 	request.setAttribute("questions", updatedQuestions);
 	request.setAttribute("questionNumber", WebUtil.readIntParam(request, "questionNumber"));
+	request.setAttribute("numQuestionsFieldname", WebUtil.readStrParam(request, "numQuestionsFieldname"));
+	request.setAttribute("containingDivName", WebUtil.readStrParam(request, "containingDivName", true));
 	return "/authoring/template/tool/" + templatePage;
     }
 
@@ -1468,9 +1472,11 @@
 
 	Integer questionNumber = WebUtil.readIntParam(request, "questionNumber", true);
 	Integer delete = WebUtil.readIntParam(request, "optionNumber");
+	
 	boolean useAssessmentVersion = WebUtil.readBooleanParam(request, "assess", false);
-
-	TreeMap<Integer, Option> optionsMap = getOptions(request, questionNumber, useAssessmentVersion);
+	String containingDivName = WebUtil.readStrParam(request,  "containingDivName", true);
+	String prefixParam =  containingDivName != null ? containingDivName  + "assmcq" : "question";
+	TreeMap<Integer, Option> optionsMap = getOptions(request, questionNumber, prefixParam);
 	optionsMap.remove(delete);
 	// reorder the displayOrder and setup the return value
 	LinkedList<Option> options = new LinkedList<>();
@@ -1482,6 +1488,7 @@
 	request.setAttribute("questionNumber", questionNumber);
 	request.setAttribute("options", options);
 	request.setAttribute("optionCount", options.size());
+	request.setAttribute("containingDivName", containingDivName);
 	return (useAssessmentVersion ? "authoring/template/tool/assessredooption"
 		: "authoring/template/tool/mcredooption");
     }
@@ -1500,8 +1507,9 @@
 	}
 
 	boolean useAssessmentVersion = WebUtil.readBooleanParam(request, "assess", false);
-
-	TreeMap<Integer, Option> optionsMap = getOptions(request, questionNumber, useAssessmentVersion);
+	String containingDivName = WebUtil.readStrParam(request,  "containingDivName", true);
+	String prefixParam =  containingDivName != null ? containingDivName  + "assmcq" : "question";
+	TreeMap<Integer, Option> optionsMap = getOptions(request, questionNumber, prefixParam);
 	// reorder the options and setup the return value
 	LinkedList<Option> options = new LinkedList<>();
 
@@ -1526,28 +1534,27 @@
 	request.setAttribute("questionNumber", questionNumber);
 	request.setAttribute("options", options);
 	request.setAttribute("optionCount", options.size());
+	request.setAttribute("containingDivName", WebUtil.readStrParam(request, "containingDivName", true));
 	return (useAssessmentVersion ? "authoring/template/tool/assessredooption"
 		: "authoring/template/tool/mcredooption");
     }
 
     // if mcq paramPrefix = "question". if assessment multiple choice paramPrefix = assmcq
     private TreeMap<Integer, Option> getOptions(HttpServletRequest request, Integer questionNumber,
-	    boolean useAssessmentVersion) {
+	    String prefixParam) {
 
-	String paramPrefix = useAssessmentVersion ? "assmcq" : "question";
-
 	// correctDisplayIdInteger is used for MCQ but not Survey - the value will be ignored by the
 	// survey jsp page.
-	Integer correctDisplayIdInteger = WebUtil.readIntParam(request, paramPrefix + questionNumber + "correct", true);
+	Integer correctDisplayIdInteger = WebUtil.readIntParam(request, prefixParam + questionNumber + "correct", true);
 	int correctDisplayId = correctDisplayIdInteger != null ? correctDisplayIdInteger.intValue() : 0;
 
 	TreeMap<Integer, Option> optionDtos = new TreeMap<>();
 
 	for (int i = 1; i <= MAX_OPTION_COUNT; i++) {
-	    String optionText = request.getParameter(paramPrefix + questionNumber + "option" + i);
+	    String optionText = request.getParameter(prefixParam + questionNumber  + "option" + i);
 	    if (optionText != null) {
 		// Grade is used for assessment
-		String grade = request.getParameter(paramPrefix + questionNumber + "option" + i + "grade");
+		String grade = request.getParameter(prefixParam + questionNumber + "option" + i + "grade");
 		Option option = new Option(i, i == correctDisplayId, optionText, grade);
 		optionDtos.put(new Integer(i), option);
 	    }
Index: lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java
===================================================================
diff -u -r3f18890e24de43c31ac23d49e2c1a4906e479863 -r5d865502ffc41ad5759af87eb091d9627e6965a1
--- lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java	(.../TBLTemplateController.java)	(revision 3f18890e24de43c31ac23d49e2c1a4906e479863)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java	(.../TBLTemplateController.java)	(revision 5d865502ffc41ad5759af87eb091d9627e6965a1)
@@ -90,7 +90,6 @@
 
     @Override
     protected ObjectNode createLearningDesign(HttpServletRequest request, HttpSession httpSession) throws Exception {
-
 	TBLData data = new TBLData(request);
 	if (data.getErrorMessages() != null && data.getErrorMessages().size() > 0) {
 	    ObjectNode restRequestJSON = JsonNodeFactory.instance.objectNode();
@@ -126,8 +125,9 @@
 	}
 
 	// Grouping
+	activityTitle = data.getText("boilerplate.grouping.title");
 	ObjectNode[] groupingJSONs = createGroupingActivity(maxUIID, order++, currentActivityPosition,
-		data.groupingType, data.numLearners, data.numGroups, null, null, data.getUIBundle(),
+		data.groupingType, data.numLearners, data.numGroups, activityTitle, null, data.getUIBundle(),
 		data.getFormatter());
 	activities.add(groupingJSONs[0]);
 	groupings.add(groupingJSONs[1]);
@@ -149,7 +149,7 @@
 	    currentActivityPosition = calcPositionNextRight(currentActivityPosition);
 	    activityTitle = data.getText("boilerplate.ira.title");
 	    Long iRAToolContentId = createMCQToolContent(userDTO, activityTitle,
-		    data.getText("boilerplate.ira.instructions"), false, data.confidenceLevelEnable,
+		    data.getText("boilerplate.ira.instructions"), false, data.confidenceLevelEnable, false,
 		    JsonUtil.readArray(data.testQuestions.values()));
 	    ObjectNode iraActivityJSON = createMCQActivity(maxUIID, order++, currentActivityPosition, iRAToolContentId,
 		    data.contentFolderID, groupingUIID, null, null, activityTitle);
@@ -189,51 +189,88 @@
 
 	}
 
+	// Application Exercises - multiple exercises with gates between each exercise. There may also be a grouped 
+	// notebook after an exercise if indicated by the user. Each Application Exercise will have one or more questions.
+	// Start a new row so that they group nicely together
 	int displayOrder = 1;
+	String displayOrderAsString =  Integer.toString(displayOrder);
 	if (data.useApplicationExercises) {
-	    // Stop!
-	    firstActivityInRowPosition = calcPositionBelow(firstActivityInRowPosition);
-	    currentActivityPosition = firstActivityInRowPosition;
-	    activityTitle = data.getText("boilerplate.before.app.ex");
-	    if (data.useScheduledGates && data.aeStartOffset != null) {
-		activities.add(createScheduledGateActivity(maxUIID, order++, calcGateOffset(currentActivityPosition),
-			activityTitle, data.aeStartOffset));
-	    } else {
-		activities.add(
-			createGateActivity(maxUIID, order++, calcGateOffset(currentActivityPosition), activityTitle));
-	    }
+	    String gateTitleBeforeAppEx = data.getText("boilerplate.before.app.ex");
+	    String gateTitleBeforeNotebook = data.getText("boilerplate.before.app.ex.notebook");
 
-	    // Application Exercise - all the questions go into one exercise
-	    currentActivityPosition = calcPositionNextRight(currentActivityPosition);
-	    ArrayNode questionsJSONArray = JsonNodeFactory.instance.arrayNode();
-	    for (Assessment exerciseQuestion : data.applicationExercises.values()) {
-		if ( exerciseQuestion.getTitle() == null ) {
-		    // put in a dummy title if one is not supplied by the user
-		    String applicationExerciseTitle = data.getText("boilerplate.ae.application.exercise.num",
-				new String[] { Integer.toString(displayOrder) });
-		    exerciseQuestion.setTitle(applicationExerciseTitle);
+	    for (AppExData applicationExercise : data.applicationExercises.values()) {
+		
+		// Start a new row for each application exercise and potentially the notebook.
+		firstActivityInRowPosition = calcPositionBelow(firstActivityInRowPosition);
+		currentActivityPosition = firstActivityInRowPosition;
+
+		//  Gate before Application Exercise 
+		if (data.useScheduledGates && data.aeStartOffset != null) {
+		    activities.add(createScheduledGateActivity(maxUIID, order++,
+			    calcGateOffset(currentActivityPosition), gateTitleBeforeAppEx, data.aeStartOffset));
+		} else {
+		    activities.add(createGateActivity(maxUIID, order++, calcGateOffset(currentActivityPosition),
+			    gateTitleBeforeAppEx));
 		}
-		questionsJSONArray.add(exerciseQuestion.getAsObjectNode(displayOrder));
+
+		// Application Exercise
+		int assessmentNumber = 1;
+		String applicationExerciseTitle = data.getText("boilerplate.ae.application.exercise.num",
+			new String[] { displayOrderAsString });
+		currentActivityPosition = calcPositionNextRight(currentActivityPosition);
+		ArrayNode questionsJSONArray = JsonNodeFactory.instance.arrayNode();
+		for (Assessment exerciseQuestion : applicationExercise.assessments.values()) {
+		    if (exerciseQuestion.getTitle() == null) {
+			// put in a dummy title if one is not supplied by the user
+			exerciseQuestion.setTitle(data.getText("boilerplate.ae.question.num",
+				new String[] { Integer.toString(assessmentNumber) }));
+		    }
+			questionsJSONArray.add(exerciseQuestion.getAsObjectNode(assessmentNumber));
+			assessmentNumber++;
+		}
+		Long aetoolContentId = createAssessmentToolContent(userDTO, applicationExerciseTitle,
+			data.getText("boilerplate.ae.instructions"), null, true, false, questionsJSONArray);
+		activities.add(createAssessmentActivity(maxUIID, order++, currentActivityPosition, aetoolContentId,
+			data.contentFolderID, groupingUIID, null, null, applicationExerciseTitle));
+
+		// Optional Gate / Notebook. Don't add the extra gate in LAMS TBL or we will get too many scheduled gates to manage
+		if (applicationExercise.useNotebook) {
+		    if (!data.useScheduledGates) {
+			currentActivityPosition = calcPositionNextRight(currentActivityPosition);
+			activities.add(createGateActivity(maxUIID, order++, calcGateOffset(currentActivityPosition),
+				gateTitleBeforeNotebook));
+		    }
+		    currentActivityPosition = calcPositionNextRight(currentActivityPosition);
+		    String notebookTitle = data.getText("boilerplate.grouped.notebook.num",
+				new String[] { displayOrderAsString });
+		    Long reflectionToolContentId = createNotebookToolContent(userDTO, notebookTitle,
+			    applicationExercise.notebookInstructions, false, false);
+		    activities.add(createNotebookActivity(maxUIID, order++, currentActivityPosition,
+			    reflectionToolContentId, data.contentFolderID, groupingUIID, null, null, notebookTitle));
+		}
+
 		displayOrder++;
 	    }
-	    String overallAssessmentTitle = data.getText("boilerplate.ae.application.exercise.num",
-		    new String[] { "" });
-	    Long aetoolContentId = createAssessmentToolContent(userDTO, overallAssessmentTitle,
-		    data.getText("boilerplate.ae.instructions"), null, true, questionsJSONArray);
-	    activities.add(createAssessmentActivity(maxUIID, order++, currentActivityPosition, aetoolContentId,
-		    data.contentFolderID, groupingUIID, null, null, overallAssessmentTitle));
+
 	}
 
+	firstActivityInRowPosition = calcPositionBelow(firstActivityInRowPosition);
+	currentActivityPosition = firstActivityInRowPosition;
+
 	if (data.usePeerReview) {
 	    // Peer Review - optional. Start by eliminating all criterias with no title. Then if any are left 
-	    // we create the tool data and activity
-	    currentActivityPosition = calcPositionNextRight(currentActivityPosition);
+	    // we create the gate before the Peer Review and the Peer Review tool data and activity
 	    ArrayNode criterias = JsonNodeFactory.instance.arrayNode();
 	    for (PeerReviewCriteria criteria : data.peerReviewCriteria.values()) {
 		if (criteria.getTitle() != null && criteria.getTitle().length() > 0)
 		    criterias.add(criteria.getAsObjectNode());
 	    }
 	    if (criterias.size() > 0) {
+		// Stop!
+		activities.add(createGateActivity(maxUIID, order++, calcGateOffset(currentActivityPosition),
+			data.getText("boilerplate.before.peer.review")));
+
+		currentActivityPosition = calcPositionNextRight(currentActivityPosition);
 		String peerReviewTitle = data.getText("boilerplate.peerreview");
 		Long prtoolContentId = createPeerReviewToolContent(userDTO, peerReviewTitle,
 			data.getText("boilerplate.peerreview.instructions"), null, criterias);
@@ -266,6 +303,12 @@
 
     }
 
+    class AppExData {
+	SortedMap<Integer, Assessment> assessments;
+	boolean useNotebook = false;
+	String notebookInstructions;
+    }
+    
     /**
      * TBLData contains all the data we need for the current instance. Created for each call to ensure that we have the
      * correct locale, messages, etc for this particular call.
@@ -306,7 +349,7 @@
 
 	SortedMap<Integer, ObjectNode> testQuestions;
 	boolean confidenceLevelEnable;
-	SortedMap<Integer, Assessment> applicationExercises;
+	SortedMap<Integer, AppExData> applicationExercises;
 	SortedMap<Integer, PeerReviewCriteria> peerReviewCriteria;
 
 	int questionOffset = 8;
@@ -324,7 +367,7 @@
 	    numGroups = WebUtil.readIntParam(request, "numGroups", true);
 
 	    testQuestions = new TreeMap<Integer, ObjectNode>();
-	    applicationExercises = new TreeMap<Integer, Assessment>();
+	    applicationExercises = new TreeMap<Integer, AppExData>();
 	    peerReviewCriteria = new TreeMap<Integer, PeerReviewCriteria>();
 
 	    useIntroduction = WebUtil.readBooleanParam(request, "introduction", false);
@@ -389,7 +432,7 @@
 	    }
 
 	    if (useApplicationExercises) {
-		processAssessments(request);
+		processApplicationExercises(request);
 	    }
 
 	    validate();
@@ -415,22 +458,39 @@
 	    return null;
 	}
 
-	// Assessment entries can't be deleted or rearranged so the count should always line up with numAssessments
-	private void processAssessments(HttpServletRequest request) {
-	    int numAssessments = WebUtil.readIntParam(request, "numAssessments");
+	// Assessment entries can't be deleted or rearranged so the count should always line up with numAppEx and numAssessments
+	private void processApplicationExercises(HttpServletRequest request) {
+	    int numAppEx = WebUtil.readIntParam(request, "numAppEx");
+	    for (int i = 1; i <= numAppEx; i++) {
+		String appexDiv = "divappex"+i;
+		AppExData newAppex = new AppExData();
+		newAppex.assessments = processAssessments(request, i);
+		newAppex.useNotebook = WebUtil.readBooleanParam(request,  appexDiv+"NB", false);
+		if ( newAppex.useNotebook ) {
+		    newAppex.notebookInstructions = WebUtil.readStrParam(request,  appexDiv+"NBIns", true);
+		}
+		applicationExercises.put(i,  newAppex);
+	    }
+	}
+
+	private SortedMap<Integer, Assessment> processAssessments(HttpServletRequest request, int appexNumber) {
+	    SortedMap<Integer, Assessment> applicationExercises = new TreeMap<Integer, Assessment>();
+	    int numAssessments = WebUtil.readIntParam(request, "numAssessments" + appexNumber);
+	    
 	    for (int i = 1; i <= numAssessments; i++) {
-		String assessmentPrefix = "assessment" + i;
+		String assessmentPrefix = new StringBuilder("divass").append(appexNumber).append("assessment")
+			.append(i).toString();
 		String questionText = getTrimmedString(request, assessmentPrefix, true);
-		String questionTitle = getTrimmedString(request, assessmentPrefix+"title", true);
+		String questionTitle = getTrimmedString(request, assessmentPrefix + "title", true);
 		Assessment assessment = new Assessment();
 		if (questionText != null) {
 		    assessment.setTitle(questionTitle);
 		    assessment.setQuestionText(questionText);
 		    assessment.setType(WebUtil.readStrParam(request, assessmentPrefix + "type"));
 		    assessment.setRequired(true);
 		    if (assessment.getType() == Assessment.ASSESSMENT_QUESTION_TYPE_MULTIPLE_CHOICE) {
-			String optionPrefix = "assmcq" + i;
-			optionPrefix = optionPrefix + "option";
+			String optionPrefix = new StringBuilder("divass").append(appexNumber).append("assmcq")
+				.append(i).append("option").toString();
 			for (int o = 1, order = 0; o <= MAX_OPTION_COUNT; o++) {
 			    String answer = getTrimmedString(request, optionPrefix + o, true);
 			    if (answer != null) {
@@ -441,14 +501,15 @@
 				} catch (Exception e) {
 				    log.error("Error parsing " + grade + " for float", e);
 				    addValidationErrorMessage(
-					    "authoring.error.application.exercise.not.blank.and.grade", new Object[i]);
+					    "authoring.error.application.exercise.not.blank.and.grade", new Object[] {appexNumber, i});
 				}
 			    }
 			}
 		    }
 		    applicationExercises.put(i, assessment);
 		}
 	    }
+	    return applicationExercises;
 	}
 
 	void processInputPeerReviewRequestField(String name, HttpServletRequest request) {
@@ -551,24 +612,45 @@
 	    }
 	    if (sequenceTitle == null || !ValidationUtil.isOrgNameValid(sequenceTitle)) {
 		addValidationErrorMessage("authoring.fla.title.validation.error", null);
-	    } 
+	    }
 
 	    if (useApplicationExercises) {
-		if (applicationExercises.size() == 0) {
-		    addValidationErrorMessage("authoring.error.application.exercise.num", new Integer[] { 1 });
-		} else {
-		    for (Map.Entry<Integer, Assessment> assessmentEntry : applicationExercises.entrySet()) {
-			List<String> errors = assessmentEntry.getValue().validate(appBundle, formatter,
-				assessmentEntry.getKey());
-			if (errors != null)
-			    errorMessages.addAll(errors);
-		    }
-		}
+		validateApplicationExercises();
 	    }
 	    // grouping is enforced on the front end by the layout & by requiring the groupingType
 	    // questions are validated in updateCorrectAnswers
 	}
 
+	private void validateApplicationExercises() {
+	    if (applicationExercises.size() == 0) {
+	        addValidationErrorMessage("authoring.error.application.exercise.num", new Integer[] { 1 });
+	    } else {
+	        for (Map.Entry<Integer, AppExData> appExEntry : applicationExercises.entrySet()) {
+	    	AppExData appEx = appExEntry.getValue();
+	    	if (appEx.assessments == null || appEx.assessments.size() == 0) {
+	    	    addValidationErrorMessage("authoring.error.application.exercise.num",
+	    		    new Integer[] { appExEntry.getKey() });
+	    	} else {
+	    	    for (Map.Entry<Integer, Assessment> assessmentEntry : appEx.assessments.entrySet()) {
+	    		List<String> errors = assessmentEntry.getValue().validate(appBundle, formatter,
+	    			appExEntry.getKey(), assessmentEntry.getKey());
+	    		if (errors != null)
+	    		    errorMessages.addAll(errors);
+	    	    }
+	    	}
+	        }
+	    }
+	}
+
     }
 
+    // Create the application exercise form on the screen. Not in LdTemplateController as this is specific to TBL
+    // and hence the jsp is in the tbl template folder, not the tool template folder
+    @RequestMapping("/createApplicationExercise")
+    public String createApplicationExercise(HttpServletRequest request) {
+	request.setAttribute("appexNumber", WebUtil.readIntParam(request, "appexNumber"));
+	return "/authoring/template/tbl/appex";
+    }
+
+
 }
Index: lams_central/web/authoring/template/comms.jsp
===================================================================
diff -u -r3f18890e24de43c31ac23d49e2c1a4906e479863 -r5d865502ffc41ad5759af87eb091d9627e6965a1
--- lams_central/web/authoring/template/comms.jsp	(.../comms.jsp)	(revision 3f18890e24de43c31ac23d49e2c1a4906e479863)
+++ lams_central/web/authoring/template/comms.jsp	(.../comms.jsp)	(revision 5d865502ffc41ad5759af87eb091d9627e6965a1)
@@ -127,23 +127,33 @@
 			$('#templateForm').submit();
 		}
 
+		// Triggers the import window. The saving is done in a method saveQTI(formHTML, formName, callerID) which should be defined in the main template jsp file.
+		// CallerID can be set to define which tab has triggered the QTI import, as TBL has import on both the RAT Questions and App Ex tabs.
+		function importQTI(callerID, limit){
+		 	var url = '<lams:LAMSURL/>questions/questionFile.jsp?callerID='+callerID;
+		 	if ( limit ) {
+		 		url = url + '&limitType='+limit;
+		 	}
+	    	window.open(url,'QuestionFile','width=500,height=240,scrollbars=yes');
+	    }
 
-		function createAssessment(questionType) {
+		function createAssessment(questionType, numAssessmentsFieldname, containingDivName ) {
+			var numAssessments = $('#'+numAssessmentsFieldname);
 			var type = questionType ? questionType : 'essay';
-			var currNum = $('#numAssessments').val();
+			var currNum = numAssessments.val();
 			var nextNum = +currNum + 1;
 			var newDiv = document.createElement("div");
-			newDiv.id = 'divassess'+nextNum;
-			newDiv.className = 'space-top';
-			var url=getSubmissionURL()+"/createAssessment.do?questionNumber="+nextNum+"&questionType="+type;
-			$('#divassessments').append(newDiv);
+			newDiv.id = containingDivName+'divassess'+nextNum;
+			newDiv.className = 'space-top space-sides';
+			var url=getSubmissionURL()+"/createAssessment.do?questionNumber="+nextNum+"&questionType="+type+"&containingDivName="+containingDivName;
+			$('#'+containingDivName).append(newDiv);
 			$.ajaxSetup({ cache: true });
 			$(newDiv).load(url, function( response, status, xhr ) {
 				if ( status == "error" ) {
 					console.log( xhr.status + " " + xhr.statusText );
 					newDiv.remove();
 				} else {
-					$('#numAssessments').val(nextNum);
+					numAssessments.val(nextNum);
 					newDiv.scrollIntoView();
 				}
 			});
@@ -234,9 +244,7 @@
 			});
 		}		
 
-		function getOptionData(questionNum, assessment) {
-			var paramPrefix  =  assessment ? "assmcq" : "question"; 
-			paramPrefix = paramPrefix + questionNum;
+		function getOptionData(questionNum, paramPrefix) {
 			var data = { };
 			var correctField = paramPrefix + "correct";
 			$('#templateForm').find('input, textarea, select').each(function() {
@@ -251,13 +259,18 @@
 		    return data;
 		}
 		
-		function swapOptions(questionNum, optionNum1, optionNum2, divToLoad, assessment) {
+		function swapOptions(questionNum, optionNum1, optionNum2, divToLoad, appexContainingDivName) {
 			refreshCKEditors() ;
-			var url=getSubmissionURL()+"/swapOption.do?questionNumber="+questionNum+"&optionNumber1="+optionNum1+"&optionNumber2="+optionNum2;
-			if ( assessment ) {
-				url += "&assess=true";
+
+			var paramPrefix  =  appexContainingDivName ? appexContainingDivName  + "assmcq" : "question"; 
+			paramPrefix = paramPrefix + questionNum;
+			var data = getOptionData(questionNum, paramPrefix);
+
+			var url=getSubmissionURL()+"/swapOption.do?questionNumber="+questionNum+"&optionNumber1="+optionNum1
+				+"&optionNumber2="+optionNum2;
+			if ( appexContainingDivName ) {
+				url += "&containingDivName="+appexContainingDivName+"&assess=true";
 			}
-			var data = getOptionData(questionNum, assessment);
 
 			$.ajaxSetup({ cache: true });
 			jqueryDivToLoad = divToLoad ? $('#'+divToLoad) : $('#divq'+questionNum+'options');
@@ -269,12 +282,16 @@
 			});
 		}
 
-		function removeOption(questionNum, optionNum, divToLoad, assessment) {
+		function removeOption(questionNum, optionNum, divToLoad, appexContainingDivName) {
 			refreshCKEditors() ;
+
+			var paramPrefix  =  appexContainingDivName ? appexContainingDivName  + "assmcq" : "question"; 
+			paramPrefix = paramPrefix + questionNum;
+			var data = getOptionData(questionNum, paramPrefix);
+
 			var url=getSubmissionURL()+"/deleteOption.do?questionNumber="+questionNum+"&optionNumber="+optionNum;
-			if ( assessment ) 
-				url += "&assess=true";
-			var data = getOptionData(questionNum, assessment);
+			if ( appexContainingDivName ) 
+				url += "&containingDivName="+appexContainingDivName+"&assess=true";
 				
 			$.ajaxSetup({ cache: true });
 			jqueryDivToLoad = divToLoad ? $('#'+divToLoad) : $('#divq'+questionNum+'options');
@@ -383,12 +400,3 @@
 			} 
 			return true;
 		}
-
-
-		function importQTI(callerID, limit){
-		 	var url = '<lams:LAMSURL/>questions/questionFile.jsp?callerID='+callerID;
-		 	if ( limit ) {
-		 		url = url + '&limitType='+limit;
-		 	}
-	    	window.open(url,'QuestionFile','width=500,height=240,scrollbars=yes');
-	    }
Index: lams_central/web/authoring/template/tbl/appex.jsp
===================================================================
diff -u
--- lams_central/web/authoring/template/tbl/appex.jsp	(revision 0)
+++ lams_central/web/authoring/template/tbl/appex.jsp	(revision 5d865502ffc41ad5759af87eb091d9627e6965a1)
@@ -0,0 +1,57 @@
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%-- Application Exercise. It should have one or more essay or multiple choice questions. If QTI Import is used then all the questions are put into one exercise. --%>
+
+<!--  Start of panel Appex${appexNumber} -->
+ <div class="panel panel-default" id="divappex${appexNumber}" >
+     <div class="panel-heading" id="headingAppex${appexNumber}">
+     	<span class="panel-title collapsable-icon-left">
+     		<a class="${status.first ? '' : 'collapsed'}" role="button" data-toggle="collapse" href="#collapseAppex${appexNumber}" 
+			aria-expanded="${status.first ? 'false' : 'true'}" aria-controls="collapseAppex${appexNumber}" >
+					${appexNumber eq 1 ? "<label class=\"required\">" : ""}
+						<fmt:message key="authoring.label.application.exercise.num"><fmt:param value="${appexNumber}"/></fmt:message>
+					${appexNumber eq 1 ? "</label>" : ""}
+			</a>
+		</span>
+     </div>
+    
+    <div id="collapseAppex${appexNumber}" class="panel-collapse collapse in" 
+    		role="tabpanel" aria-labelledby="headingAppex${appexNumber}">	
+    				
+		 	<input type="hidden" name="numAssessments${appexNumber}" id="numAssessments${appexNumber}" value="0"/>
+			<div id="divass${appexNumber}"></div>
+			<div class="space-top space-sides">
+				<a href="#" onclick="javascript:createAssessment('essay', 'numAssessments${appexNumber}', 'divass${appexNumber}');" class="btn btn-default"><fmt:message key="authoring.create.essay.question"/></a>
+				<a href="#" onclick="javascript:createAssessment('mcq', 'numAssessments${appexNumber}', 'divass${appexNumber}');" class="btn btn-default"><fmt:message key="authoring.create.mc.question"/></a>
+				<a href="#" onClick="javascript:importQTI('appex${appexNumber}')" class="btn btn-default pull-right"><fmt:message key="authoring.template.basic.import.qti" /></a>
+			</div>
+			<div class="space-top space-sides space-bottom">
+				<div class="checkbox"><label for="divappex${appexNumber}NB">
+					<input name="divappex${appexNumber}NB" id="divappex${appexNumber}NB" type="checkbox" value="true"/> <fmt:message key="authoring.tbl.use.notebook" />
+				</label></div>
+				<div class="form-group">
+					<textarea id="divappex${appexNumber}NBIns" name="divappex${appexNumber}NBIns" class="form-control" rows="3"></textarea>
+				</div>
+			</div>
+	</div>
+	
+	<script type="text/javascript">
+	//automatically turn on refect option if there are text input in refect instruction area
+	var notebook${appexNumber} = document.getElementById("divappex${appexNumber}NB");
+	var instructions${appexNumber} = document.getElementById("divappex${appexNumber}NBIns");
+	function turnOnIns${appexNumber}(){
+		if(isEmpty(instructions${appexNumber}.value)){
+			//turn off	
+			notebook${appexNumber}.checked = false;
+		}else{
+			//turn on
+			notebook${appexNumber}.checked = true;		
+		}
+	}
+	
+	instructions${appexNumber}.onkeyup=turnOnIns${appexNumber};
+	</script>
+	
+</div> 
+<!--  End of panel Appex${appexNumber} -->
Index: lams_central/web/authoring/template/tbl/tbl.jsp
===================================================================
diff -u -r3f18890e24de43c31ac23d49e2c1a4906e479863 -r5d865502ffc41ad5759af87eb091d9627e6965a1
--- lams_central/web/authoring/template/tbl/tbl.jsp	(.../tbl.jsp)	(revision 3f18890e24de43c31ac23d49e2c1a4906e479863)
+++ lams_central/web/authoring/template/tbl/tbl.jsp	(.../tbl.jsp)	(revision 5d865502ffc41ad5759af87eb091d9627e6965a1)
@@ -17,7 +17,20 @@
  	<%@ include file="../header.jsp" %>
  
  	<title><fmt:message key="authoring.tbl.template.title"/></title>
-
+	
+	<style>
+		div.space-top {
+			padding-top: 15px;
+		}
+		div.space-sides {
+			padding-left: 15px;
+			padding-right: 15px;
+		}
+		div.space-bottom {
+			padding-bottom: 15px;
+		}
+	</style>
+	
 	<script type="text/javascript">
 
 		<%@ include file="../comms.jsp" %>
@@ -68,19 +81,46 @@
 			// Remove the display:none or the fields won't be validate as jquery validation is set to only valid non hidden fields. 
 			// If we allow validation of hidden fields then we cannot have validation on the Still should not be seen as visibility is hidden
 			// catch the editor update and redo validation otherwise error message won't go away when the user enters text.
+			debugger;
 			initializeWizard(validator);
 			reconfigureCKEditorInstance(CKEDITOR.instances.question1);
 
 		});
 
+		function createApplicationExercise(numAppexFieldname ) {
+			var numAppex = $('#numAppEx');
+			var currNum = numAppex.val();
+			var nextNum = +currNum + 1;
+			var newDiv = document.createElement("div");
+			newDiv.id = 'divappex'+nextNum;
+			newDiv.className = 'panel panel-default';
+			var url=getSubmissionURL()+"/createApplicationExercise.do?appexNumber="+nextNum;
+			$('#accordianAppEx').append(newDiv);
+			$.ajaxSetup({ cache: true });
+			$(newDiv).load(url, function( response, status, xhr ) {
+				if ( status == "error" ) {
+					console.log( xhr.status + " " + xhr.statusText );
+					newDiv.remove();
+				} else {
+					numAppex.val(nextNum);
+					newDiv.scrollIntoView();
+					// close all the others
+					var i;
+					for (i = 1; i <= currNum; i++) {
+						$('#collapseAppex'+i).removeClass('in');
+					}
+				}
+			});
+		}		
 
 		<%-- matching importQTI(limit) function is in comms.jsp --%>
 	    function saveQTI(formHTML, formName, callerID) {
 	    	var form = $($.parseHTML(formHTML));
 
-	    	if ( callerID == 'assessment' ) {
-		    	var nextNum  = +$('#numAssessments').val()+1;
-				var url=getSubmissionURL()+"/importQTI.do?contentFolderID=${contentFolderID}&templatePage=assessmentQTI&questionNumber="+nextNum;
+	    	if ( callerID == 'mcq' ) {
+		    	var nextNum  = +$('#numQuestions').val()+1,
+						url=getSubmissionURL()+'/importQTI.do?contentFolderID=${contentFolderID}&templatePage=mcquestionQTI&questionNumber='
+								+nextNum+'&numQuestionsFieldname=numQuestions';
 				$.ajaxSetup({ cache: true });
 				$.ajax({
 					type: "POST",
@@ -90,15 +130,18 @@
 						if ( status == "error" ) {
 							console.log( xhr.status + " " + xhr.statusText );
 						} else {
-							$('#divassessments').append(response);
-							$('#divassess'+nextNum)[0].scrollIntoView();
+							$('#divquestions').append(response);
+							$('#divq'+nextNum)[0].scrollIntoView();
 						}
 					}
 				});
-
 	    	} else {
-		    	var nextNum  = +$('#numQuestions').val()+1;
-				var url=getSubmissionURL()+"/importQTI.do?contentFolderID=${contentFolderID}&templatePage=mcquestionQTI&questionNumber="+nextNum;
+	    		var	appexIndex = +(callerID.substring(5)),
+	    				numQuestionsFieldname = 'numAssessments'+appexIndex,
+	    				containingDivName = 'divass'+appexIndex,
+		    			nextNum  = +$('#'+numQuestionsFieldname).val()+1,
+		    			url=getSubmissionURL()+'/importQTI.do?contentFolderID=${contentFolderID}&templatePage=assessmentQTI&questionNumber='
+		    					+nextNum+'&containingDivName='+containingDivName+'&numQuestionsFieldname='+numQuestionsFieldname;
 				$.ajaxSetup({ cache: true });
 				$.ajax({
 					type: "POST",
@@ -108,8 +151,8 @@
 						if ( status == "error" ) {
 							console.log( xhr.status + " " + xhr.statusText );
 						} else {
-							$('#divquestions').append(response);
-							$('#divq'+nextNum)[0].scrollIntoView();
+							$('#'+containingDivName).append(response);
+							$('#'+containingDivName+'divassess'+nextNum)[0].scrollIntoView();
 						}
 					}
 				});
@@ -196,19 +239,18 @@
 		<div class="tab-pane" id="tab4">
 			<span class="field-name"><fmt:message key="authoring.tbl.desc.ae" /></span>
 			
-		 	<input type="hidden" name="numAssessments" id="numAssessments" value="0"/>
+			<input type="hidden" name="numAppEx" id="numAppEx" value="1"/>
 	
-			<div id="divassessments">
-			</div>
+			<div class="panel-group" id="accordianAppEx" role="tablist" aria-multiselectable="true"> 
+			<c:set var="appexNumber" scope="page">1</c:set>
+			<%@ include file="appex.jsp" %>
+			</div> <!--  end panel group -->
+
+			<a href="#" id="createApplicationExerciseButton" onclick="javascript:createApplicationExercise();" class="btn btn-default"><fmt:message key="authoring.create.application.exercise"/></a>
 			
-			<span class="voffset10">
-			<a href="#" onclick="javascript:createAssessment('essay');" class="btn btn-default"><fmt:message key="authoring.create.essay.question"/></a>
-			<a href="#" onclick="javascript:createAssessment('mcq');" class="btn btn-default"><fmt:message key="authoring.create.mc.question"/></a>
-			<a href="#" onClick="javascript:importQTI('assessment')" class="btn btn-default pull-right"><fmt:message key="authoring.template.basic.import.qti" /></a>
-			</span>
-			
 	    </div>
-	    	<div class="tab-pane" id="tab5">
+
+    	<div class="tab-pane" id="tab5">
 			<span class="field-name"><fmt:message key="authoring.tbl.desc.peer.review" /></span>
 			
 		 	<input type="hidden" name="numRatingCriterias" id="numRatingCriterias" value="1"/>
Index: lams_central/web/authoring/template/tool/assessmcq.jsp
===================================================================
diff -u -r3f18890e24de43c31ac23d49e2c1a4906e479863 -r5d865502ffc41ad5759af87eb091d9627e6965a1
--- lams_central/web/authoring/template/tool/assessmcq.jsp	(.../assessmcq.jsp)	(revision 3f18890e24de43c31ac23d49e2c1a4906e479863)
+++ lams_central/web/authoring/template/tool/assessmcq.jsp	(.../assessmcq.jsp)	(revision 5d865502ffc41ad5759af87eb091d9627e6965a1)
@@ -8,22 +8,25 @@
 <c:set var="required">${questionNumber eq 1 ? "class=\"input required\"" : "class=\"input\""}</c:set>
 
 <%-- Generic MCQ question for assessment. Expects an input of questionNumber, contentFolderID, and creates a text field field question${questionNumber} and three options.
-         Question, and hence question.title and question.text are optional and are only populated if QTI is used to start the questions. --%>
+         Question, and hence question.title and question.text are optional and are only populated if QTI is used to start the questions. ${containingDivName} is set if this is being called from 
+         a page with multiple sets of assessments, like the Application Exercises for TBL. --%>
 
 <div class="panel panel-default">
 	<div class="panel-heading">
 		<div class="panel-title">		
 		${questionNumber eq 1 ? "<label class=\"required\">" : ""}
-			<fmt:message key="authoring.label.application.exercise.num"><fmt:param value="${questionNumber}"/></fmt:message>
+			<fmt:message key="authoring.label.question.num"><fmt:param value="${questionNumber}"/></fmt:message>
 		${questionNumber eq 1 ? "</label>" : ""}
 		</div>
 	</div>
 
 	<div class="panel-body">	
 
-	<input type="hidden" name="assessment${questionNumber}type" id="assessment${questionNumber}type" value="mcq"/>
-	<input name="assessment${questionNumber}title" id="assessment${questionNumber}title" class="form-control" type="text" maxlength="200"  value="${question.title}"/>
-	<lams:CKEditor id="assessment${questionNumber}" value="${question.text}" contentFolderID="${contentFolderID}" height="100"></lams:CKEditor>
+	<input type="hidden" name="${containingDivName}assessment${questionNumber}type" id="${containingDivName}assessment${questionNumber}type" value="mcq"/>
+	<span class="field-name" class="input"><label for="${containingDivName}assessment${questionNumber}title"><fmt:message key="label.title"/></label></span>
+	<input name="${containingDivName}assessment${questionNumber}title" id="${containingDivName}assessment${questionNumber}title" class="form-control" type="text" maxlength="200"  value="${question.title}"/>
+	<span class="field-name"><label for="${containingDivName}assessment${questionNumber}" class="input required"><fmt:message key="authoring.label.question.text" /></label></span>
+	<lams:CKEditor id="${containingDivName}assessment${questionNumber}" value="${question.text}" contentFolderID="${contentFolderID}" height="100"></lams:CKEditor>
 	
 	<table class="table table-condensed table-no-border">
 	<tr><td></td><td></td>
@@ -39,47 +42,47 @@
 	</tr>
 	</table>
 	
-	<div id="divassmcq${questionNumber}options">
+	<div id="${containingDivName}divassmcq${questionNumber}options">
 	<c:choose>
 
 	<c:when test="${not empty question.answers}">
 	<c:set var="numAnswers">${fn:length(question.answers)}</c:set>
-	<input type="hidden" name="assmcq${questionNumber}numOptions" id="assmcq${questionNumber}numOptions" value="${numAnswers}"/>
+	<input type="hidden" name="${containingDivName}assmcq${questionNumber}numOptions" id="${containingDivName}assmcq${questionNumber}numOptions" value="${numAnswers}"/>
 	<c:set scope="request" var="optionCount">${numAnswers}</c:set>
 	<c:forEach items="${question.answers}" var="answer" varStatus="loopStatus">
 		<c:set scope="request" var="optionText">${answer.text}</c:set>
 		<c:set scope="request" var="optionNumber">${loopStatus.count}</c:set>
 		<c:set scope="request" var="optionGrade">${answer.score}</c:set>
-		<div id="divassmcq${questionNumber}opt${optionNumber}">
+		<div id="${containingDivName}divassmcq${questionNumber}opt${optionNumber}">
 		<%@ include file="assessoption.jsp" %>
 		</div>
 	</c:forEach>
 	</c:when>
 
 	<c:otherwise>
-	<input type="hidden" name="assmcq${questionNumber}numOptions" id="assmcq${questionNumber}numOptions" value="4"/>
+	<input type="hidden" name="${containingDivName}assmcq${questionNumber}numOptions" id="${containingDivName}assmcq${questionNumber}numOptions" value="4"/>
 	<c:set scope="request" var="optionCount">4</c:set>
 	<c:set scope="request" var="optionText"></c:set>
-	<div id="divassmcq${questionNumber}opt1">
+	<div id="${containingDivName}divassmcq${questionNumber}opt1">
 	<c:set scope="request" var="optionNumber">1</c:set>
 	<%@ include file="assessoption.jsp" %>
 	</div>
-	<div id="divassmcq${questionNumber}opt2">
+	<div id="${containingDivName}divassmcq${questionNumber}opt2">
 	<c:set scope="request" var="optionNumber">2</c:set>
 	<%@ include file="assessoption.jsp" %>
 	</div>
-	<div id="divassmcq${questionNumber}opt3">
+	<div id="${containingDivName}divassmcq${questionNumber}opt3">
 	<c:set scope="request" var="optionNumber">3</c:set>
 	<%@ include file="assessoption.jsp" %>
 	</div>
-	<div id="divassmcq${questionNumber}opt4">
+	<div id="${containingDivName}divassmcq${questionNumber}opt4">
 	<c:set scope="request" var="optionNumber">4</c:set>
 	<%@ include file="assessoption.jsp" %>
 	</div>
-	</div>
 	</c:otherwise>
 	
 	</c:choose>
+	</div>
 	
 	<div id="createAssessmentOptionButton${questionNumber}" class="pull-right"><a href="#" onclick="javascript:createAssessmentOption(${questionNumber},${maxOptionCount});" class="btn btn-default btn-sm"><fmt:message key="authoring.create.option"/></a></div>
 	
Index: lams_central/web/authoring/template/tool/assessment.jsp
===================================================================
diff -u -r3f18890e24de43c31ac23d49e2c1a4906e479863 -r5d865502ffc41ad5759af87eb091d9627e6965a1
--- lams_central/web/authoring/template/tool/assessment.jsp	(.../assessment.jsp)	(revision 3f18890e24de43c31ac23d49e2c1a4906e479863)
+++ lams_central/web/authoring/template/tool/assessment.jsp	(.../assessment.jsp)	(revision 5d865502ffc41ad5759af87eb091d9627e6965a1)
@@ -2,22 +2,26 @@
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-core" prefix="c"%>
 <%-- Generic assessment tool page. Expects an input of questionNumber & contentFolderID, and creates a field named assessment${questionNumber} suitable for a essay entry.
-  Question, and hence question.title and question.text are optional and are only populated if QTI is used to start the questions. --%>
+  Question, and hence question.title and question.text are optional and are only populated if QTI is used to start the questions. ${containingDivName} is set if this is being called from 
+         a page with multiple sets of assessments, like the Application Exercises for TBL. --%>
 
 <div class="panel panel-default">
 	<div class="panel-heading">
 		<div class="panel-title">		
 		${questionNumber eq 1 ? "<label class=\"required\">" : ""}
-			<fmt:message key="authoring.label.application.exercise.num"><fmt:param value="${questionNumber}"/></fmt:message>
+			<fmt:message key="authoring.label.question.num"><fmt:param value="${questionNumber}"/></fmt:message>
 		${questionNumber eq 1 ? "</label>" : ""}
 		</div>
 	</div>
 
 	<div class="panel-body">	
 	
-	<input type="hidden" name="assessment${questionNumber}type" id="assessment${questionNumber}type" value="essay"/>
-	<input name="assessment${questionNumber}title" id="assessment${questionNumber}Title" class="form-control" type="text" maxlength="200" value="${question.title}"/>
-	<lams:CKEditor id="assessment${questionNumber}" value="${question.text}" contentFolderID="${contentFolderID}" height="100"></lams:CKEditor>
+	<input type="hidden" name="${containingDivName}assessment${questionNumber}type" id="${containingDivName}assessment${questionNumber}type" value="essay"/>
 	
+	<span class="field-name" class="input"><label for="${containingDivName}assessment${questionNumber}title"><fmt:message key="label.title"/></label></span>
+	<input name="${containingDivName}assessment${questionNumber}title" id="${containingDivName}assessment${questionNumber}Title" class="form-control" type="text" maxlength="200" value="${question.title}"/>
+	<span class="field-name"><label for="${containingDivName}assessment${questionNumber}" class="input required"><fmt:message key="authoring.label.question.text" /></label></span>
+	<lams:CKEditor id="${containingDivName}assessment${questionNumber}" value="${question.text}" contentFolderID="${contentFolderID}" height="100"></lams:CKEditor>
+	
 	</div>
 </div>
\ No newline at end of file
Index: lams_central/web/authoring/template/tool/assessmentQTI.jsp
===================================================================
diff -u -r3f18890e24de43c31ac23d49e2c1a4906e479863 -r5d865502ffc41ad5759af87eb091d9627e6965a1
--- lams_central/web/authoring/template/tool/assessmentQTI.jsp	(.../assessmentQTI.jsp)	(revision 3f18890e24de43c31ac23d49e2c1a4906e479863)
+++ lams_central/web/authoring/template/tool/assessmentQTI.jsp	(.../assessmentQTI.jsp)	(revision 5d865502ffc41ad5759af87eb091d9627e6965a1)
@@ -10,7 +10,7 @@
 <c:set scope="request" var="questionNumber">${currentNumber}</c:set>
 <c:set scope="request" var="question">${question}</c:set>
 
-<div id="divassess${currentNumber}" class="space-top">
+<div id="${containingDivName}divassess${currentNumber}" class="space-top space-sides">
 <c:choose>
 <c:when test="${not empty question.answers}">
 		<%@ include file="../tool/assessmcq.jsp" %>
@@ -25,5 +25,5 @@
 
 </c:forEach>
 <script>
-	$('#numAssessments').val("${currentNumber-1}");
+	$('#${numQuestionsFieldname}').val("${currentNumber-1}");
 </script>
Index: lams_central/web/authoring/template/tool/assessoption.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r5d865502ffc41ad5759af87eb091d9627e6965a1
--- lams_central/web/authoring/template/tool/assessoption.jsp	(.../assessoption.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/authoring/template/tool/assessoption.jsp	(.../assessoption.jsp)	(revision 5d865502ffc41ad5759af87eb091d9627e6965a1)
@@ -1,9 +1,9 @@
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-core" prefix="c"%>
-<%-- Option page for the Assessment Multiple Choice question. Creates the output assmcq${questionNumber}option${optionNumber} --%>
+<%-- Option page for the Assessment Multiple Choice question. Creates the output ${containingDivName}assmcq${questionNumber}option${optionNumber} --%>
 
-		<c:set scope="request" var="qnon">assmcq${questionNumber}option${optionNumber}</c:set>
+		<c:set scope="request" var="qnon">${containingDivName}assmcq${questionNumber}option${optionNumber}</c:set>
 
 		<table class="table table-condensed table-no-border">
 		<tr>
@@ -22,15 +22,15 @@
 			<!-- Don't display up icon if first line -->
 			<c:if test="${optionNumber > 1}">
  				<lams:Arrow state="up" id="${qnon}UpButton" title="<fmt:message key='hint.option.up'/>" 
- 					onclick="javascript:swapOptions(${questionNumber}, ${optionNumber}, ${optionNumber-1}, 'divassmcq${questionNumber}options', true)"/>
+ 					onclick="javascript:swapOptions(${questionNumber}, ${optionNumber}, ${optionNumber-1}, '${containingDivName}divassmcq${questionNumber}options', '${containingDivName}')"/>
  			</c:if>
 			<!-- Don't display down icon if last line -->
 			<c:set var="display" value="${optionCount > optionNumber ? '' : 'none'}"/>
 			<lams:Arrow state="down" id="${qnon}DownButton" title="<fmt:message key='hint.option.down'/>" 
-				onclick="javascript:swapOptions(${questionNumber}, ${optionNumber}, ${optionNumber+1}, 'divassmcq${questionNumber}options', true)" display="${display}"/>
+				onclick="javascript:swapOptions(${questionNumber}, ${optionNumber}, ${optionNumber+1}, '${containingDivName}divassmcq${questionNumber}options', '${containingDivName}')" display="${display}"/>
  		</td>
 		<td width="20px" align="center">
-			<i class="fa fa-times" id="${qnon}DeleteButton" title="<fmt:message key='hint.option.delete'/>" onclick="removeOption(${questionNumber}, ${optionNumber}, 'divassmcq${questionNumber}options', true)">
+			<i class="fa fa-times" id="${qnon}DeleteButton" title="<fmt:message key='hint.option.delete'/>" onclick="removeOption(${questionNumber}, ${optionNumber}, '${containingDivName}divassmcq${questionNumber}options', '${containingDivName}')">
 		</td>
 		</tr>
 		</table>
\ No newline at end of file
Index: lams_central/web/authoring/template/tool/assessredooption.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r5d865502ffc41ad5759af87eb091d9627e6965a1
--- lams_central/web/authoring/template/tool/assessredooption.jsp	(.../assessredooption.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/authoring/template/tool/assessredooption.jsp	(.../assessredooption.jsp)	(revision 5d865502ffc41ad5759af87eb091d9627e6965a1)
@@ -3,9 +3,9 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%-- Generic Q&A page - wraps an option so it is redisplayed after moving. Inputs ${questionNumber}, ${optionCount}, ${option.displayOrder},${option.text} --%>
 
-	<input type="hidden" name="assmcq${questionNumber}numOptions" id="assmcq${questionNumber}numOptions" value="${optionCount}"/>
+	<input type="hidden" name="${containingDivName}assmcq${questionNumber}numOptions" id="${containingDivName}assmcq${questionNumber}numOptions" value="${optionCount}"/>
 	<c:forEach items="${options}" var="option">
-		<div id="divassmcq${questionNumber}opt${option.displayOrder}">
+		<div id="${containingDivName}divassmcq${questionNumber}opt${option.displayOrder}">
 		<c:set scope="request" var="optionNumber">${option.displayOrder}</c:set>
 		<c:set scope="request" var="optionText">${option.text}</c:set>
 		<c:set scope="request" var="optionGrade">${option.grade}</c:set>
Index: lams_central/web/authoring/template/tool/mcquestionQTI.jsp
===================================================================
diff -u -r3f18890e24de43c31ac23d49e2c1a4906e479863 -r5d865502ffc41ad5759af87eb091d9627e6965a1
--- lams_central/web/authoring/template/tool/mcquestionQTI.jsp	(.../mcquestionQTI.jsp)	(revision 3f18890e24de43c31ac23d49e2c1a4906e479863)
+++ lams_central/web/authoring/template/tool/mcquestionQTI.jsp	(.../mcquestionQTI.jsp)	(revision 5d865502ffc41ad5759af87eb091d9627e6965a1)
@@ -18,5 +18,5 @@
 
 </c:forEach>
 <script>
-	$('#numQuestions').val("${currentNumber-1}");
+	$('#${numQuestionsFieldname}').val("${currentNumber-1}");
 </script>