diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/template/snippet.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/template/snippet.controller.js
new file mode 100644
index 0000000000..dc0f2bead1
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/template/snippet.controller.js
@@ -0,0 +1,7 @@
+angular.module("umbraco").controller('Umbraco.Dialogs.Template.SnippetController',
+		function($scope, $http, dialogService) {
+		    $scope.type = $scope.dialogOptions.type;
+		    $scope.section = {};
+		    $scope.section.name = "";
+		    $scope.section.required = false;          
+		});
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/template/snippet.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/template/snippet.html
new file mode 100644
index 0000000000..1414a7471c
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/template/snippet.html
@@ -0,0 +1,39 @@
+<form novalidate name="contentForm"
+    ng-controller="Umbraco.Dialogs.Template.SnippetController"
+    ng-submit="close()"
+    val-form-manager>
+	
+	<style>
+
+	</style>
+
+	<div class="umb-panel">
+
+		<div class="umb-panel-header">
+		    <h1 class="headline" style="margin: 10px 0 0 0">Configure the section</h1>
+		</div>
+
+	    <div class="umb-panel-body with-footer umb-querybuilder">
+            <label>
+                Section name:
+                <input type="text" ng-model="section.name" />
+            </label>
+            <label ng-show="type === 'rendersection'">
+                Required?
+                <input type="checkbox" ng-checked="section.required" ng-model="section.required" />
+            </label>
+	    </div>	
+
+		<div class="umb-panel-footer" >
+			<div class="umb-el-wrap umb-panel-buttons">
+		        <div class="btn-toolbar umb-btn-toolbar pull-right">
+		            <a href ng-click="close()" class="btn btn-link">
+		                <localize key="general_close">Close</localize>
+		            </a>
+                    
+                    <a href ng-click="submit(section)" class="btn btn-primary">Insert</a>
+		        </div>
+	      </div>
+		</div>
+	</div>
+</form>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/Umbraco/Images/editor/renderbody.gif b/src/Umbraco.Web.UI/Umbraco/Images/editor/renderbody.gif
new file mode 100644
index 0000000000..1a84493fe9
Binary files /dev/null and b/src/Umbraco.Web.UI/Umbraco/Images/editor/renderbody.gif differ
diff --git a/src/Umbraco.Web.UI/umbraco/settings/views/EditView.aspx.cs b/src/Umbraco.Web.UI/umbraco/settings/views/EditView.aspx.cs
index cd739711fb..c08e4ba48c 100644
--- a/src/Umbraco.Web.UI/umbraco/settings/views/EditView.aspx.cs
+++ b/src/Umbraco.Web.UI/umbraco/settings/views/EditView.aspx.cs
@@ -248,29 +248,33 @@ namespace Umbraco.Web.UI.Umbraco.Settings.Views
 		/// </summary>
 		private void InitializeEditorForTemplate()
 		{
-			
-			//TODO: implement content placeholders, etc... just like we had in v5
 
-			//Panel1.Menu.InsertSplitter();
+            //TODO: implement content placeholders, etc... just like we had in v5
 
-			//MenuIconI umbContainer = Panel1.Menu.NewIcon();
-			//umbContainer.ImageURL = UmbracoPath + "/images/editor/masterpagePlaceHolder.gif";
-			//umbContainer.AltText = ui.Text("template", "insertContentAreaPlaceHolder");
-			//umbContainer.OnClickCommand =
-			//	ClientTools.Scripts.OpenModalWindow(
-			//		IOHelper.ResolveUrl(SystemDirectories.Umbraco) +
-			//		"/dialogs/insertMasterpagePlaceholder.aspx?&id=" + _template.Id,
-			//		ui.Text("template", "insertContentAreaPlaceHolder"), 470, 320);
+            editorSource.Menu.InsertSplitter();
 
-			//MenuIconI umbContent = Panel1.Menu.NewIcon();
-			//umbContent.ImageURL = UmbracoPath + "/images/editor/masterpageContent.gif";
-			//umbContent.AltText = ui.Text("template", "insertContentArea");
-			//umbContent.OnClickCommand =
-			//	ClientTools.Scripts.OpenModalWindow(
-			//		IOHelper.ResolveUrl(SystemDirectories.Umbraco) + "/dialogs/insertMasterpageContent.aspx?id=" +
-			//		_template.Id, ui.Text("template", "insertContentArea"), 470, 300);
-			
-		}
+            MenuIconI umbRenderBody = editorSource.Menu.NewIcon();
+            umbRenderBody.ImageURL = UmbracoPath + "/images/editor/renderbody.gif";
+            //umbContainer.AltText = ui.Text("template", "insertContentAreaPlaceHolder");
+            umbRenderBody.AltText = "Insert @RenderBody()";
 
-	}
+            umbRenderBody.OnClickCommand = "editViewEditor.insertRenderBody()";
+
+            MenuIconI umbSection = editorSource.Menu.NewIcon();
+            umbSection.ImageURL = UmbracoPath + "/images/editor/masterpagePlaceHolder.gif";
+            //umbContainer.AltText = ui.Text("template", "insertContentAreaPlaceHolder");
+            umbSection.AltText = "Insert Section";
+
+            umbSection.OnClickCommand = "editViewEditor.openSnippetModal('section')";
+
+            MenuIconI umbRenderSection = editorSource.Menu.NewIcon();
+            umbRenderSection.ImageURL = UmbracoPath + "/images/editor/masterpageContent.gif";
+            //umbContainer.AltText = ui.Text("template", "insertContentAreaPlaceHolder");
+            umbRenderSection.AltText = "Insert @RenderSection";
+
+            umbRenderSection.OnClickCommand = "editViewEditor.openSnippetModal('rendersection')";
+
+        }
+
+    }
 }
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/umbraco_client/Editors/EditView.js b/src/Umbraco.Web.UI/umbraco_client/Editors/EditView.js
index 00fda4db21..509de8ed28 100644
--- a/src/Umbraco.Web.UI/umbraco_client/Editors/EditView.js
+++ b/src/Umbraco.Web.UI/umbraco_client/Editors/EditView.js
@@ -36,6 +36,10 @@
             
             UmbEditor.Insert("@Umbraco.RenderMacro(\"" + alias + "\")", "", this._opts.codeEditorElementId);
         },
+
+        insertRenderBody: function() {
+            UmbEditor.Insert("@RenderBody()", "", this._opts.codeEditorElementId);
+        },
         
         openMacroModal: function (alias) {
             /// <summary>callback used to display the modal dialog to insert a macro with parameters</summary>
@@ -54,6 +58,37 @@
             });
         },
 
+        openSnippetModal: function (type) {
+            /// <summary>callback used to display the modal dialog to insert a macro with parameters</summary>
+
+            var self = this;
+
+            UmbClientMgr.openAngularModalWindow({
+                template: "views/common/dialogs/template/snippet.html",
+                callback: function (data) {
+
+                    var code = "";
+
+                    if (type === 'section') {
+                        code = "\n@section " + data.name + "{\n";
+                        code += "<!-- Content here -->\n" +
+                            "}\n";
+                    }
+
+                    if (type === 'rendersection') {
+                        if (data.required) {
+                            code = "\n@RenderSection(\"" + data.name + "\", true);\n";
+                        } else {
+                            code = "\n@RenderSection(\"" + data.name + "\" false);\n";
+                        }
+                    }
+
+                    UmbEditor.Insert(code, '', self._opts.codeEditorElementId);
+                },
+                type: type
+            });
+        },
+
 
         openQueryModal: function () {
             /// <summary>callback used to display the modal dialog to insert a macro with parameters</summary>