Index: lams_central/web/authoring/authoring.jsp
===================================================================
diff -u -r770004eb10d23298f103767a30bae3175b43e2e3 -r45253ccd280463e84a285c845333ad81d8a10ebe
--- lams_central/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision 770004eb10d23298f103767a30bae3175b43e2e3)
+++ lams_central/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision 45253ccd280463e84a285c845333ad81d8a10ebe)
@@ -434,129 +434,10 @@
 					      </div>
 					   </div>
 					</c:forTokens>
-						
-					<c:forEach var="tool" items="${tools}">
-						<div
-							 toolId="${tool.toolId}"
-							 learningLibraryId="${tool.learningLibraryId}"
-							 learningLibraryTitle="${tool.learningLibraryTitle}"
-							 defaultToolContentId="${tool.defaultToolContentId}"
-							 supportsOutputs="${tool.supportsOutputs}"
-							 iconPath="${tool.iconPath}"
-							 childToolIds="
-							 <c:forEach var='childId' items='${tool.childToolIds}'>
-							 	${childId},
-							 </c:forEach>
-							 "
-							 class="template"
-							 <%-- Hide invalid tools --%>
-							 <c:if test="${not tool.valid}">
-							 	style="display: none"
-							 </c:if>
-							 >
-							 <div>
-								<div class="media">
-	  								<div class="media-left">
-	  									<img src="<lams:LAMSURL/>${tool.iconPath}" />
-	  								</div>
-	  								<div class="media-body media-middle tool-display-name">
-										<c:out value="${tool.toolDisplayName}" />
-									</div>
-								</div>
-							</div>
-						</div>
-					</c:forEach>
 					
-					<div
-						 learningLibraryId="grouping"
-						 learningLibraryTitle="grouping"
-						 iconPath="images/svg/grouping.svg"
-						 class="template"
-						 >
-						 <div>
-							<div class="media">
-  								<div class="media-left">
-  									<img src="<lams:LAMSURL/>images/svg/grouping.svg" />
-  								</div>
-  								<div class="media-body media-middle tool-display-name">
-									<fmt:message key="authoring.fla.page.menu.group" />
-								</div>
-							</div>
-						</div>
-					</div>
+					<%-- Shared with svgGenerator.jsp --%>
+					<%@ include file="authoringTemplatePart.jsp"%> 
 					
-					<div
-						 learningLibraryId="gate"
-						 learningLibraryTitle="gate"
-						 iconPath="images/svg/gateClosed.svg"
-						 class="template"
-						 >
-						 <div>
-							<div class="media">
-  								<div class="media-left">
-  									<img src="<lams:LAMSURL/>images/svg/gateClosed.svg" />
-  								</div>
-  								<div class="media-body media-middle tool-display-name">
-									<fmt:message key="authoring.fla.page.menu.flow.gate" />
-								</div>
-							</div>
-						</div>
-					</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"
-						 class="template"
-						 >
-						 <div>
-							<div class="media">
-  								<div class="media-left">
-  									<img src="<lams:LAMSURL/>images/svg/optional.svg" />
-  								</div>
-  								<div class="media-body media-middle tool-display-name">
-									<fmt:message key="authoring.fla.page.menu.optional" />
-								</div>
-							</div>
-						</div>
-					</div>
-					
-					<div
-						 learningLibraryId="floating"
-						 learningLibraryTitle="floating"
-						 iconPath="images/svg/floating.svg"
-						 class="template"
-						 >
-						 <div>
-							<div class="media">
-  								<div class="media-left">
-  									<img src="<lams:LAMSURL/>images/svg/floating.svg" />
-  								</div>
-  								<div class="media-body media-middle tool-display-name">
-									<fmt:message key="authoring.fla.page.menu.optional.support" />
-								</div>
-							</div>
-						</div>
-					</div>
-					
 				</div>
 			</td>
 			<td id="canvasContainerCell">
Index: lams_central/web/authoring/authoringTemplatePart.jsp
===================================================================
diff -u
--- lams_central/web/authoring/authoringTemplatePart.jsp	(revision 0)
+++ lams_central/web/authoring/authoringTemplatePart.jsp	(revision 45253ccd280463e84a285c845333ad81d8a10ebe)
@@ -0,0 +1,123 @@
+<!DOCTYPE html>
+<%@ include file="/common/taglibs.jsp"%>
+<c:forEach var="tool" items="${tools}">
+	<div
+		 toolId="${tool.toolId}"
+		 learningLibraryId="${tool.learningLibraryId}"
+		 learningLibraryTitle="${tool.learningLibraryTitle}"
+		 defaultToolContentId="${tool.defaultToolContentId}"
+		 supportsOutputs="${tool.supportsOutputs}"
+		 iconPath="${tool.iconPath}"
+		 childToolIds="
+		 <c:forEach var='childId' items='${tool.childToolIds}'>
+		 	${childId},
+		 </c:forEach>
+		 "
+		 class="template"
+		 <%-- Hide invalid tools --%>
+		 <c:if test="${not tool.valid}">
+		 	style="display: none"
+		 </c:if>
+		 >
+		 <div>
+			<div class="media">
+						<div class="media-left">
+							<img src="<lams:LAMSURL/>${tool.iconPath}" />
+						</div>
+						<div class="media-body media-middle tool-display-name">
+					<c:out value="${tool.toolDisplayName}" />
+				</div>
+			</div>
+		</div>
+	</div>
+</c:forEach>
+
+<div
+	 learningLibraryId="grouping"
+	 learningLibraryTitle="grouping"
+	 iconPath="images/svg/grouping.svg"
+	 class="template"
+	 >
+	 <div>
+		<div class="media">
+					<div class="media-left">
+						<img src="<lams:LAMSURL/>images/svg/grouping.svg" />
+					</div>
+					<div class="media-body media-middle tool-display-name">
+				<fmt:message key="authoring.fla.page.menu.group" />
+			</div>
+		</div>
+	</div>
+</div>
+
+<div
+	 learningLibraryId="gate"
+	 learningLibraryTitle="gate"
+	 iconPath="images/svg/gateClosed.svg"
+	 class="template"
+	 >
+	 <div>
+		<div class="media">
+					<div class="media-left">
+						<img src="<lams:LAMSURL/>images/svg/gateClosed.svg" />
+					</div>
+					<div class="media-body media-middle tool-display-name">
+				<fmt:message key="authoring.fla.page.menu.flow.gate" />
+			</div>
+		</div>
+	</div>
+</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"
+	 class="template"
+	 >
+	 <div>
+		<div class="media">
+					<div class="media-left">
+						<img src="<lams:LAMSURL/>images/svg/optional.svg" />
+					</div>
+					<div class="media-body media-middle tool-display-name">
+				<fmt:message key="authoring.fla.page.menu.optional" />
+			</div>
+		</div>
+	</div>
+</div>
+
+<div
+	 learningLibraryId="floating"
+	 learningLibraryTitle="floating"
+	 iconPath="images/svg/floating.svg"
+	 class="template"
+	 >
+	 <div>
+		<div class="media">
+					<div class="media-left">
+						<img src="<lams:LAMSURL/>images/svg/floating.svg" />
+					</div>
+					<div class="media-body media-middle tool-display-name">
+				<fmt:message key="authoring.fla.page.menu.optional.support" />
+			</div>
+		</div>
+	</div>
+</div>
\ No newline at end of file
Index: lams_central/web/authoring/svgGenerator.jsp
===================================================================
diff -u -rfcdf2dbcbad524eb257a95b5555796ab84c376f9 -r45253ccd280463e84a285c845333ad81d8a10ebe
--- lams_central/web/authoring/svgGenerator.jsp	(.../svgGenerator.jsp)	(revision fcdf2dbcbad524eb257a95b5555796ab84c376f9)
+++ lams_central/web/authoring/svgGenerator.jsp	(.../svgGenerator.jsp)	(revision 45253ccd280463e84a285c845333ad81d8a10ebe)
@@ -54,22 +54,8 @@
 
 <body>
 	<div id="templateContainerCell" style="display: none">
-		<c:forEach var="tool" items="${tools}">
-			<div
-				 toolId="${tool.toolId}"
-				 learningLibraryId="${tool.learningLibraryId}"
-				 learningLibraryTitle="${tool.learningLibraryTitle}"
-				 supportsOutputs="${tool.supportsOutputs}"
-				 iconPath="${tool.iconPath}"
-				 childToolIds="
-				 <c:forEach var='childId' items='${tool.childToolIds}'>
-				 	${childId},
-				 </c:forEach>
-				 "
-				 class="template">
-				<div><c:out value="${tool.toolDisplayName}" /></div>
-			</div>
-		</c:forEach>
+		<%-- Shared with svgGenerator.jsp --%>
+		<%@ include file="authoringTemplatePart.jsp"%> 
 	</div>
 
 	<div id="canvas"></div>