Index: lams_central/web/authoring/authoring.jsp
===================================================================
diff -u -r0d6040c9210892968af715aa0465365e2b3fdc8d -r770004eb10d23298f103767a30bae3175b43e2e3
--- lams_central/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision 0d6040c9210892968af715aa0465365e2b3fdc8d)
+++ lams_central/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision 770004eb10d23298f103767a30bae3175b43e2e3)
@@ -177,10 +177,6 @@
 				ARRANGE_CONFIRM : decoderDiv.html('<c:out value="${ARRANGE_CONFIRM_VAR}" />').text(),
 				<fmt:message key="authoring.fla.clear.canvas.confirm" var="CLEAR_CANVAS_CONFIRM_VAR"/>
 				CLEAR_CANVAS_CONFIRM : decoderDiv.html('<c:out value="${CLEAR_CANVAS_CONFIRM_VAR}" />').text(),
-				<fmt:message key="authoring.fla.branching.start.place.prompt" var="BRANCHING_START_PLACE_PROMPT_VAR"/>
-				BRANCHING_START_PLACE_PROMPT : decoderDiv.html('<c:out value="${BRANCHING_START_PLACE_PROMPT_VAR}" />').text(),
-				<fmt:message key="authoring.fla.branching.end.place.prompt" var="BRANCHING_END_PLACE_PROMPT_VAR"/>
-				BRANCHING_END_PLACE_PROMPT : decoderDiv.html('<c:out value="${BRANCHING_END_PLACE_PROMPT_VAR}" />').text(),
 				<fmt:message key="authoring.fla.annotation.region.place.prompt" var="ANNOTATION_REGION_PLACE_PROMPT_VAR"/>
 				ANNOTATION_REGION_PLACE_PROMPT : decoderDiv.html('<c:out value="${ANNOTATION_REGION_PLACE_PROMPT_VAR}" />').text(),
 				<fmt:message key="authoring.fla.annotation.label.place.prompt" var="ANNOTATION_LABEL_PLACE_PROMPT_VAR"/>
@@ -370,19 +366,6 @@
 			<i class="fa fa-long-arrow-right"></i> 
 			<span class="hidden-sm hidden-xs"><fmt:message key="authoring.fla.page.menu.transition" /></span>
 		</button>
-		<!-- 
-
-		<div class="btn-group btn-group-sm desktopButton" role="group">
-		  <button class="btn btn-default dropdown-toggle" type="button" id="flowButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
-		  	<i class="fa fa-map-o"></i>
-		    <span><fmt:message key="authoring.fla.page.menu.flow" /></span>
-		    <span class="caret"></span>
-		  </button>
-		  <ul class="dropdown-menu" aria-labelledby="flowButton">
-		    <li id="branchingButton" onClick="javascript:MenuLib.addBranching()"><a href="#"><fmt:message key="authoring.fla.page.menu.flow.branch" /></a></li>
-		  </ul>
-		</div>
-		 -->
 		 
 		<div class="btn-group btn-group-sm desktopButton" role="group">
 		  <button class="btn btn-default dropdown-toggle" type="button" id="annotateButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"
@@ -521,6 +504,24 @@
 					</div>
 					
 					<div
+						 learningLibraryId="branching"
+						 learningLibraryTitle="branching"
+						 iconPath="images/svg/branchingStart.svg"
+						 class="template"
+						 >
+						 <div>
+							<div class="media">
+  								<div class="media-left">
+  									<img src="<lams:LAMSURL/>images/svg/branchingStart.svg" />
+  								</div>
+  								<div class="media-body media-middle tool-display-name">
+									<fmt:message key="authoring.fla.page.menu.flow.branch" />
+								</div>
+							</div>
+						</div>
+					</div>
+					
+					<div
 						 learningLibraryId="optional"
 						 learningLibraryTitle="optional"
 						 iconPath="images/svg/optional.svg"
Index: lams_central/web/includes/javascript/authoring/authoringActivity.js
===================================================================
diff -u -r0d6040c9210892968af715aa0465365e2b3fdc8d -r770004eb10d23298f103767a30bae3175b43e2e3
--- lams_central/web/includes/javascript/authoring/authoringActivity.js	(.../authoringActivity.js)	(revision 0d6040c9210892968af715aa0465365e2b3fdc8d)
+++ lams_central/web/includes/javascript/authoring/authoringActivity.js	(.../authoringActivity.js)	(revision 770004eb10d23298f103767a30bae3175b43e2e3)
@@ -47,6 +47,7 @@
 		
 		'grouping' : 1,
 		'gate'     : 1,
+		'branching': 1,
 		'optional' : 1,
 		'floating' : 1
 },
@@ -349,16 +350,16 @@
 		}
 		
 		// make the icon more centred
-		x = GeneralLib.snapToGrid(x) + 20;
-		y = GeneralLib.snapToGrid(y);
+		x = GeneralLib.snapToGrid(x - 40) + 40;
+		y = GeneralLib.snapToGrid(y - 20) + 20;
 
 		// create activity SVG elements
-		var shape = paper.circle(x, y, 20)
+		var shape = paper.circle(x + 20, y + 20, 20)
 						 .addClass('svg-branching svg-shadow svg-branching-' + (this.isStart ? 'start' : 'end')),
-			icon = ActivityLib.getActivityIcon(this.isStart ? 'branchingStart' : 'branchingEnd');
+			icon = ActivityLib.getActivityIcon(this.isStart ? 'branching' : 'branchingEnd');
 		icon.select('svg').attr({
-			'x'     : x - 15,
-			'y'     : y - 15,
+			'x'     : x + 5,
+			'y'     : y + 5,
 			'width' : '30px',
 			'height': '30px'
 		});
@@ -374,8 +375,8 @@
 				'uiid'   : this.branchingActivity.uiid,
 				'data-x' : x,
 				'data-y' : y,
-				'data-width' : 30,
-				'data-height': 30
+				'data-width' : 40,
+				'data-height': 40
 			});
 		}
 		this.items.shape = shape;
Index: lams_central/web/includes/javascript/authoring/authoringGeneral.js
===================================================================
diff -u -r0d6040c9210892968af715aa0465365e2b3fdc8d -r770004eb10d23298f103767a30bae3175b43e2e3
--- lams_central/web/includes/javascript/authoring/authoringGeneral.js	(.../authoringGeneral.js)	(revision 0d6040c9210892968af715aa0465365e2b3fdc8d)
+++ lams_central/web/includes/javascript/authoring/authoringGeneral.js	(.../authoringGeneral.js)	(revision 770004eb10d23298f103767a30bae3175b43e2e3)
@@ -34,15 +34,12 @@
 		'dialogs' : [],
 		// for storing icons and other activity metadata
 		'toolMetadata': {
-			'branchingStart' : {
-				'iconPath'   : 'images/svg/branchingStart.svg'
-			},
 			'branchingEnd'   : {
 				'iconPath'   : 'images/svg/branchingEnd.svg'
 			},
 			'bin' : {
 				'iconPath'   : 'images/svg/authoringBin.svg'
-			}, 
+			}
 		},
 		
 		// graphics constants
@@ -263,8 +260,10 @@
 							if (learningLibraryID == 'grouping'){
 								activity = new ActivityDefs.GroupingActivity(null, null, x, y)
 							} else if (learningLibraryID == 'gate'){
-								activity = new ActivityDefs.GateActivity(null, null, x, y + 30);
-							}  else if (learningLibraryID == 'optional'){
+								activity = new ActivityDefs.GateActivity(null, null, x, y + 40);
+							} else if (learningLibraryID == 'branching') {
+								activity = new ActivityDefs.BranchingEdgeActivity(null, null, x, y, null, false, null, null);
+							} else if (learningLibraryID == 'optional'){
 								activity = new ActivityDefs.OptionalActivity(null, null, x, y);
 							} else if (learningLibraryID == 'floating') {
 								activity = new ActivityDefs.FloatingActivity(null, null, x, y);
@@ -294,6 +293,11 @@
 						layout.activities.push(activity);
 						HandlerLib.dropObject(activity);
 						ActivityLib.dropActivity(activity, eventX, eventY);
+						
+						if (activity instanceof ActivityDefs.BranchingEdgeActivity) {
+							let branchingEnd = new ActivityDefs.BranchingEdgeActivity(null, null, GeneralLib.snapToGrid(x + 120), y, null, false, null, activity.branchingActivity);
+							layout.activities.push(branchingEnd);
+						}
 				   }
 			});
 			
@@ -1368,7 +1372,7 @@
 						var startX = layout.conf.arrangeHorizontalPadding +
 									 column * layout.conf.arrangeHorizontalSpace + 80,
 							edgeY = layout.conf.arrangeVerticalPadding +
-									complex.branchingRow * layout.conf.arrangeVerticalSpace + 50,
+									complex.branchingRow * layout.conf.arrangeVerticalSpace + 20,
 							endX = layout.conf.arrangeHorizontalPadding +
 								   end.column * layout.conf.arrangeHorizontalSpace + 80;
 						
Index: lams_central/web/includes/javascript/authoring/authoringHandler.js
===================================================================
diff -u -r3510bf9db75009af42fcd5d0f64959dab092fa8f -r770004eb10d23298f103767a30bae3175b43e2e3
--- lams_central/web/includes/javascript/authoring/authoringHandler.js	(.../authoringHandler.js)	(revision 3510bf9db75009af42fcd5d0f64959dab092fa8f)
+++ lams_central/web/includes/javascript/authoring/authoringHandler.js	(.../authoringHandler.js)	(revision 770004eb10d23298f103767a30bae3175b43e2e3)
@@ -293,17 +293,6 @@
 		      .off('mouseup')
 		      .off('mousemove');
 		
-		// if the user started adding a branching and did not finish it
-		if (layout.addBranchingStart){
-			layout.infoDialog.modal('hide');
-			
-			if (layout.addBranchingStart instanceof ActivityDefs.BranchingEdgeActivity) {
-				layout.activities.splice(layout.activities.indexOf(layout.addBranchingStart), 1);
-				layout.addBranchingStart.items.remove();
-			}
-			layout.addBranchingStart = null;
-		}
-
 		if (init) {
 			 // if clicked anywhere, activity selection is gone
 			canvas.click(HandlerLib.canvasClickHandler)
Index: lams_central/web/includes/javascript/authoring/authoringMenu.js
===================================================================
diff -u -r0d6040c9210892968af715aa0465365e2b3fdc8d -r770004eb10d23298f103767a30bae3175b43e2e3
--- lams_central/web/includes/javascript/authoring/authoringMenu.js	(.../authoringMenu.js)	(revision 0d6040c9210892968af715aa0465365e2b3fdc8d)
+++ lams_central/web/includes/javascript/authoring/authoringMenu.js	(.../authoringMenu.js)	(revision 770004eb10d23298f103767a30bae3175b43e2e3)
@@ -47,45 +47,6 @@
 	
 	
 	/**
-	 * Run when branching is selected from menu. Allows placing branching and converge points on canvas.
-	 */
-	addBranching : function(){
-		HandlerLib.resetCanvasMode();
-		
-		layout.infoDialog.data('show')(LABELS.BRANCHING_START_PLACE_PROMPT, true);
-		
-		layout.addBranchingStart = true;
-		
-		var branchingActivity = null;
-		canvas.css('cursor', 'pointer').click(function(event){
-			// pageX and pageY tell event coordinates relative to the whole page
-			// we need relative to canvas
-			var translatedEvent = GeneralLib.translateEventOnCanvas(event),
-				x = translatedEvent[0] - 6,
-				y = translatedEvent[1] - 8;
-			
-			// if it is start point, branchingActivity is null and constructor acts accordingly
-			var branchingEdge = new ActivityDefs.BranchingEdgeActivity(null, null, x, y, null, false, null, branchingActivity);
-			layout.activities.push(branchingEdge);
-			
-			if (branchingActivity) {
-				// converge point was just place, end of function
-				layout.addBranchingStart = null;
-				HandlerLib.resetCanvasMode(true);
-				
-				layout.infoDialog.modal('hide');
-				
-				GeneralLib.setModified(true);
-			} else {
-				// extract main branchingActivity structure from created start point
-				branchingActivity = branchingEdge.branchingActivity;
-				layout.addBranchingStart = branchingEdge;
-				layout.infoDialog.data('show')(LABELS.BRANCHING_END_PLACE_PROMPT, true);
-			}
-		});
-	},
-
-	/**
 	 * Creates a new transition.
 	 */
 	addTransition : function() {