Index: lams_central/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -rcc4ec2888edbbef92a9befd749f8c5e37bd5c99a -r2ae92878c21c1cfeff66305f60e630191d1c64aa
--- lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision cc4ec2888edbbef92a9befd749f8c5e37bd5c99a)
+++ lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 2ae92878c21c1cfeff66305f60e630191d1c64aa)
@@ -882,8 +882,7 @@
 authoring.error.rat.not.blank = RAT Questions:  There must be at least one question.
 authoring.template.basic.import.qti = Import IMS QTI
 authoring.tbl.use.noticeboard = Add Noticeboard after AE
-authoring.create.application.exercise.assessment = Add new Assessment Application Exercise
-authoring.create.application.exercise.doku = Add new doKumaran Application Exercise
+authoring.create.application.exercise = Add new Application Exercise
 authoring.tbl.enable.confidence.tooltip = Asks students in the iRAT how confident they are with their chosen answer. Then the confidence level for each student is displayed in the tRAT to all members of their team.
 authoring.tbl.use.noticeboard.tooltip = After the AE, displays content to students as additional information or as a reflection on the AE topic.
 authoring.tbl.delete.appex.prompt = Do you want to delete the Application Exercise {0}?
@@ -1065,6 +1064,7 @@
 authoring.fla.page.prop.password = Password
 label.question.bank = Question Bank
 authoring.create.question.qb = From question bank...
+authoring.create.doku.question = Add doKumaran Question (separate AE)
 label.qb.stats.options.title = Options
 label.qb.stats.merge.title = Merge this question with...
 label.qb.stats.merge.description = This will merge this question with the question UID you entered above. Before you do this, make sure you know what are you doing as once merging is performed this cannot be undone. 
Index: lams_central/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -rc7b53dd877e2de7f9efc231db3b07ad4379eae87 -r2ae92878c21c1cfeff66305f60e630191d1c64aa
--- lams_central/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision c7b53dd877e2de7f9efc231db3b07ad4379eae87)
+++ lams_central/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 2ae92878c21c1cfeff66305f60e630191d1c64aa)
@@ -876,8 +876,6 @@
 authoring.error.rat.not.blank = RAT Questions:  There must be at least one question.
 authoring.template.basic.import.qti = Import IMS QTI
 authoring.tbl.use.noticeboard = Add Noticeboard after AE
-authoring.create.application.exercise.assessment = Add new Assessment Application Exercise
-authoring.create.application.exercise.doku = Add new doKumaran Application Exercise
 authoring.tbl.enable.confidence.tooltip = Asks students in the iRAT how confident they are with their chosen answer. Then the confidence level for each student is displayed in the tRAT to all members of their team.
 authoring.tbl.use.noticeboard.tooltip = After the AE, displays content to students as additional information or as a reflection on the AE topic.
 authoring.tbl.delete.appex.prompt = Do you want to delete the Application Exercise {0}?
Index: lams_central/web/authoring/template/tbl/appexAssessment.jsp
===================================================================
diff -u -rc7b53dd877e2de7f9efc231db3b07ad4379eae87 -r2ae92878c21c1cfeff66305f60e630191d1c64aa
--- lams_central/web/authoring/template/tbl/appexAssessment.jsp	(.../appexAssessment.jsp)	(revision c7b53dd877e2de7f9efc231db3b07ad4379eae87)
+++ lams_central/web/authoring/template/tbl/appexAssessment.jsp	(.../appexAssessment.jsp)	(revision 2ae92878c21c1cfeff66305f60e630191d1c64aa)
@@ -63,6 +63,12 @@
                     	   	<i class="fa fa-list-ul text-primary"></i> <fmt:message key="authoring.create.mc.question"/>
                     	</a>
                     </li>
+                     <li>
+                    	<a href="javascript:void(0)"
+                    	   onclick="javascript:createApplicationExercise('doku', ${appexNumber})">
+                    	   	<i class="fa fa-list-ul text-primary"></i> <fmt:message key="authoring.create.doku.question"/>
+                    	</a>
+                    </li>
                     <li>
                     	<a href="javascript:void(0)" id="divass${appexNumber}CQB"
                     	   onClick="javascript:openQuestionBank(${appexNumber})">
Index: lams_central/web/authoring/template/tbl/tbl.jsp
===================================================================
diff -u -rc7b53dd877e2de7f9efc231db3b07ad4379eae87 -r2ae92878c21c1cfeff66305f60e630191d1c64aa
--- lams_central/web/authoring/template/tbl/tbl.jsp	(.../tbl.jsp)	(revision c7b53dd877e2de7f9efc231db3b07ad4379eae87)
+++ lams_central/web/authoring/template/tbl/tbl.jsp	(.../tbl.jsp)	(revision 2ae92878c21c1cfeff66305f60e630191d1c64aa)
@@ -77,28 +77,35 @@
 			initializeWizard(validator);
 		});
 
-		function createApplicationExercise(type) {
-			var numAppex = $('#numAppEx'),
-				currNum = numAppex.val(),
-				nextNum = +currNum + 1,
-				newDiv = document.createElement("div");
+		function createApplicationExercise(type, callingAppexNumber) {
+			var targetNum = null,
+				targetDiv = null;
+			// if user chose a new doku question and current AE is empty, put the new doku AE instead of current AE
+			if (type == 'doku' && callingAppexNumber && $('#divass' + callingAppexNumber).is(':empty')) {
+				targetNum = callingAppexNumber;
+				targetDiv = $('#divappex' + targetNum);
+			} else {
+				// create a new AE
+				var numAppex = $('#numAppEx'),
+					currNum = numAppex.val();
+				targetNum = +currNum + 1;
+				targetDiv = $('<div />').attr('id', 'divappex' + targetNum).addClass('panel panel-default').appendTo('#accordianAppEx');
+			}
 
-			newDiv.id = 'divappex'+nextNum;
-			newDiv.className = 'panel panel-default';
-			var url=getSubmissionURL()+"/createApplicationExercise.do?appexNumber=" + nextNum + "&type=" + type + "&contentFolderID=${contentFolderID}";
-			$('#accordianAppEx').append(newDiv);
+			var url = getSubmissionURL() + "/createApplicationExercise.do?appexNumber=" 
+					 + targetNum + "&type=" + type + "&contentFolderID=${contentFolderID}";
+
 			$.ajaxSetup({ cache: true });
-			$(newDiv).load(url, function( response, status, xhr ) {
+			$(targetDiv).load(url, function( response, status, xhr ) {
 				if ( status == "error" ) {
 					console.log( xhr.status + " " + xhr.statusText );
-					newDiv.remove();
-				} else {
-					numAppex.val(nextNum);
-					newDiv.scrollIntoView();
+					targetDiv.remove();
+				} else if (targetNum != callingAppexNumber){
+					$('#numAppEx').val(targetNum);
+					targetDiv[0].scrollIntoView();
 					// close all the others
-					var i;
-					for (i = 1; i <= currNum; i++) {
-						$('#collapseAppex'+i).removeClass('in');
+					for (var i = 1; i < targetNum; i++) {
+						$('#collapseAppex' + i).removeClass('in');
 					}
 				}
 			});
@@ -319,12 +326,9 @@
 			<%@ include file="appexAssessment.jsp" %>
 			</div> <!--  end panel group -->
 
-			<a href="#" id="createAssessmentApplicationExerciseButton" onclick="javascript:createApplicationExercise('assessment')" class="btn btn-default">
-				<i class="fa fa-plus"></i> <fmt:message key="authoring.create.application.exercise.assessment"/>
+			<a href="#" onclick="javascript:createApplicationExercise('assessment')" class="btn btn-default">
+				<i class="fa fa-plus"></i> <fmt:message key="authoring.create.application.exercise"/>
 			</a>
-			<a href="#" id="createDokuApplicationExerciseButton" onclick="javascript:createApplicationExercise('doku')" class="btn btn-default">
-				<i class="fa fa-plus"></i> <fmt:message key="authoring.create.application.exercise.doku"/>
-			</a>
 			
 	    </div>