diff --git a/src/app/partials/submenu.html b/src/app/partials/submenu.html
index ab432753bc0..a9b2230237e 100644
--- a/src/app/partials/submenu.html
+++ b/src/app/partials/submenu.html
@@ -10,8 +10,8 @@
 									<i class="icon-cog"></i>
 								</a>
 								<ul class="dropdown-menu">
-									<li><a class="pointer" config-modal="app/partials/templating_editor.html">Edit replacements</a></li>
-									<li><a class="pointer" config-modal="app/partials/annotations_editor.html">Edit annotations</a></li>
+									<li><a class="pointer" config-modal="app/partials/templating_editor.html">Templating</a></li>
+									<li><a class="pointer" config-modal="app/partials/annotations_editor.html">Annotations</a></li>
 								</ul>
 							</div>
 						</li>
@@ -35,7 +35,7 @@
 							</div>
 						</li>
 
-						<li ng-repeat="annotation in dashboard.annotations.list" class="grafana-target-segment annotation-segment" ng-class="{'annotation-disabled': !annotation.enable }">
+						<li ng-repeat="annotation in dashboard.annotations.list" class="grafana-target-segment annotation-segment" ng-class="{'annotation-disabled': !annotation.enable}">
 							<i class="annotation-color-icon icon-bolt"></i>
 							<a ng-click="hide(annotation)">{{annotation.name}}</a>
 						</li>
diff --git a/src/app/partials/templating_editor.html b/src/app/partials/templating_editor.html
new file mode 100644
index 00000000000..0282ea26ade
--- /dev/null
+++ b/src/app/partials/templating_editor.html
@@ -0,0 +1,15 @@
+<div ng-controller="AnnotationsEditorCtrl" ng-init="init()">
+	<div class="modal-body">
+		<div class="pull-right editor-title">Templating</div>
+
+		<div class="editor-row">
+		</div>
+
+	</div>
+
+	<div class="modal-footer">
+		<button ng-show="currentIsNew" type="button" class="btn btn-success" ng-click="add()">Add annotation</button>
+		<button ng-show="!currentIsNew" type="button" class="btn btn-success" ng-click="update()">Update</button>
+		<button type="button" class="btn btn-danger" ng-click="close_edit();dismiss();dashboard.refresh();">Close</button>
+	</div>
+</div>