diff --git a/src/Orchard.Web/Core/Contents/Views/Admin/Edit.cshtml b/src/Orchard.Web/Core/Contents/Views/Admin/Edit.cshtml
index 7bc3cc4e0..35029fb4f 100644
--- a/src/Orchard.Web/Core/Contents/Views/Admin/Edit.cshtml
+++ b/src/Orchard.Web/Core/Contents/Views/Admin/Edit.cshtml
@@ -1,3 +1,12 @@
+@{
+	var typeDisplayName = Model.ContentItem.TypeDefinition.DisplayName;
+	var pageTitle = T("Edit Content");
+	if (!string.IsNullOrWhiteSpace(typeDisplayName)) {
+		pageTitle = T("Edit {0}", typeDisplayName);
+	}
+}
+
+<h1>@Html.TitleForPage(pageTitle)</h1>
 @using (Html.BeginFormAntiForgeryPost()) {
     @Html.ValidationSummary()
     @Display(Model)
diff --git a/src/Orchard.Web/Core/Contents/Views/Items/Content.Edit.cshtml b/src/Orchard.Web/Core/Contents/Views/Items/Content.Edit.cshtml
index 1fc48fd18..cd35a776c 100644
--- a/src/Orchard.Web/Core/Contents/Views/Items/Content.Edit.cshtml
+++ b/src/Orchard.Web/Core/Contents/Views/Items/Content.Edit.cshtml
@@ -1,7 +1,11 @@
-content item -> @Model.ContentItem.ContentType
-
-@Display(Model.primary)
-
-<fieldset>
-    <input class="button primaryAction" type="submit" name="submit.Save" value="@T("Save")"/>
-</fieldset>
\ No newline at end of file
+<div class="sections">
+    <div class="primary">
+        @Display(Model.primary)
+    </div>
+    <div class="secondary">
+        @Display(Model.secondary)
+        <fieldset>
+            <input class="button primaryAction" type="submit" name="submit.Save" value="@T("Save")"/>
+        </fieldset>
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/Orchard.Web/Core/Routable/Views/EditorTemplates/Parts/Routable.RoutePart.cshtml b/src/Orchard.Web/Core/Routable/Views/EditorTemplates/Parts/Routable.RoutePart.cshtml
index bdd049a21..b02615f3e 100644
--- a/src/Orchard.Web/Core/Routable/Views/EditorTemplates/Parts/Routable.RoutePart.cshtml
+++ b/src/Orchard.Web/Core/Routable/Views/EditorTemplates/Parts/Routable.RoutePart.cshtml
@@ -1,7 +1,7 @@
 @model Orchard.Core.Routable.ViewModels.RoutableEditorViewModel
 @using Orchard.Utility.Extensions
+@using Orchard.Mvc.Spooling
 
-@Html.RegisterFootScript("jquery.slugify.js");
 <fieldset>
     @Html.LabelFor(m => m.Title)
     @Html.TextBoxFor(m => m.Title, new { @class = "large text" })
@@ -13,22 +13,31 @@
     <label for="@ViewData.TemplateInfo.GetFullHtmlFieldId("PromoteToHomePage")" class="forcheckbox">@T("Set as home page")</label>
 </fieldset>
 
-@// todo: (sebros) add this script at the end of the page
-@/* 
-<script type="text/javascript">
-    $(function(){
-        //pull slug input from tab order
-        $("#@Html.FieldIdFor(m=>m.Slug)").attr("tabindex",-1);
-        $("#@Html.FieldIdFor(m=>m.Title)").blur(function(){
-            var slug = $("#@Html.FieldIdFor(m=>m.Slug)");
-            if (slug.val()) { return true; }
-            $(this).slugify({
-                target:slug,
-                url:"@Url.Action("Slugify","Item",new RouteValueDictionary{{"Area","Routable"}})",
-                contentType:"@Model.ContentType",
-                id:"@Model.Id" @if (Model.ContainerId != null) { <text>, containerId:@Model.ContainerId</text> }
-            })
-        })
-    })
-</script>
-*/
\ No newline at end of file
+@{
+	Html.RegisterFootScript("jquery.slugify.js");
+
+	OutputStack.Push(new HtmlStringWriter());
+	try {
+		<script type="text/javascript">
+			$(function(){
+				//pull slug input from tab order
+				$("#@Html.FieldIdFor(m=>m.Slug)").attr("tabindex",-1);
+				$("#@Html.FieldIdFor(m=>m.Title)").blur(function(){
+					var slug = $("#@Html.FieldIdFor(m=>m.Slug)");
+					if (slug.val()) { return true; }
+					$(this).slugify({
+						target:slug,
+						contentType:"@Model.ContentType",
+						id:"@Model.Id",
+						@if (Model.ContainerId != null) {<text>containerId:@Model.ContainerId,</text>}
+						url:"@Url.Action("Slugify","Item",new RouteValueDictionary{{"Area","Routable"}})"
+					})
+				})
+			})
+		</script> 
+	}
+	finally {
+		var script = OutputStack.Pop();
+		WorkContext.Page.Tail.Add(script);
+	}
+}