diff --git a/src/Orchard.Web/Packages/Orchard.DevTools/Views/Content/Details.aspx b/src/Orchard.Web/Packages/Orchard.DevTools/Views/Content/Details.aspx
index 5872bbe3d..44d240e96 100644
--- a/src/Orchard.Web/Packages/Orchard.DevTools/Views/Content/Details.aspx
+++ b/src/Orchard.Web/Packages/Orchard.DevTools/Views/Content/Details.aspx
@@ -1,20 +1,22 @@
-<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<Orchard.DevTools.ViewModels.ContentDetailsViewModel>" %>
+<%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage<ContentDetailsViewModel>" %>
+<%@ Import Namespace="Orchard.DevTools.ViewModels"%>
 <%@ Import Namespace="Orchard.ContentManagement"%>
 <%@ Import Namespace="System.Reflection" %>
-<h1><%=Html.TitleForPage(string.Format("{0} Content Type", Model.Item.ContentItem.ContentType), "Content")%></h1>
-<h3>Content Item</h3>
-<p>Id:
+<h1><%=Html.TitleForPage(T("{0} Content Type", Model.Item.ContentItem.ContentType).ToString(), T("Content").ToString())%></h1>
+<h2><%=_Encoded("Content Item")%></h2>
+<p>
+<%=_Encoded("Id:")%>
     <%=Model.Item.ContentItem.Id %><br />
-Version:
+<%=_Encoded("Version:")%>
     <%=Model.Item.ContentItem.Version %><br />
-ContentType:
-    <%=Model.Item.ContentItem.ContentType%> <br />
-DisplayText: 
+<%=_Encoded("ContentType:")%>
+    <%=Model.Item.ContentItem.ContentType %><br />
+<%=_Encoded("DisplayText:")%> 
     <%=Html.ItemDisplayText(Model.Item) %><br />
-Links: 
-    <%=Html.ItemDisplayLink("view", Model.Item) %> <%=Html.ItemEditLink("edit", Model.Item) %></p>
-    
-<h3>Content Item Parts</h3>
+<%=_Encoded("Links:")%> 
+    <%=Html.ItemDisplayLink(T("view").ToString(), Model.Item) %> <%=Html.ItemEditLink(T("edit").ToString(), Model.Item) %>
+</p>
+<h2><%=_Encoded("Content Item Parts")%></h2>
 <ul>
     <%foreach (var partType in Model.PartTypes.OrderBy(x => x.Name)) {%>
     <li><span style="font-weight: bold;">
@@ -36,7 +38,7 @@ Links:
                       valueItem = (value as IContent).ContentItem;
                   }
                   if (valueItem != null) {
-                      %><%=Html.ActionLink(valueItem.ContentType + " #" + valueItem.Id, "details", new { valueItem.Id }, new { })%><%
+                      %><%=Html.ActionLink(T("{0} #{1} v{2}", valueItem.ContentType, valueItem.Id).ToString(), "details", new { valueItem.Id }, new { })%><%
                   }
                   %>
                 <ul style="margin-left: 20px">
diff --git a/src/Orchard.Web/Packages/Orchard.DevTools/Views/Content/Index.aspx b/src/Orchard.Web/Packages/Orchard.DevTools/Views/Content/Index.aspx
index 0e938169b..5c185c4e6 100644
--- a/src/Orchard.Web/Packages/Orchard.DevTools/Views/Content/Index.aspx
+++ b/src/Orchard.Web/Packages/Orchard.DevTools/Views/Content/Index.aspx
@@ -1,17 +1,19 @@
-<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<Orchard.DevTools.ViewModels.ContentIndexViewModel>" %>
-<h1><%=Html.TitleForPage("Content") %></h1>
-<h2>Content Types</h2>
+<%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage<ContentIndexViewModel>" %>
+<%@ Import Namespace="Orchard.DevTools.ViewModels"%>
+<h1><%=Html.TitleForPage(T("Content").ToString()) %></h1>
+<h2><%=_Encoded("Content Types")%></h2>
 <ul>
 <%foreach(var item in Model.Types.OrderBy(x=>x.Name)){%>
-<li><%=Html.Encode(item.Name) %> </li>
+    <li><%=Html.Encode(item.Name) %></li>
 <%}%>
 </ul>
-
-<h2>Content Items</h2>
+<h2><%=_Encoded("Content Items")%></h2>
 <ul>
 <%foreach(var item in Model.Items.OrderBy(x=>x.Id)){%>
-<li><%=Html.ActionLink(item.Id+": "+item.ContentType, "details", "content", new{item.Id},new{}) %>
-<%=Html.ItemDisplayLink("view", item) %>
- <%=Html.ItemEditLink("edit", item) %></li>
+    <li>
+        <%=Html.ActionLink(T("{0}: {1}", item.Id, item.ContentType).ToString(), "details", "content", new{item.Id},new{}) %>
+        <%=Html.ItemDisplayLink(T("view").ToString(), item) %>
+        <%=Html.ItemEditLink(T("edit").ToString(), item) %>
+    </li>
 <%}%>
 </ul>
\ No newline at end of file
diff --git a/src/Orchard.Web/Packages/Orchard.DevTools/Views/DisplayTemplates/Parts/DevTools.ShowDebugLink.ascx b/src/Orchard.Web/Packages/Orchard.DevTools/Views/DisplayTemplates/Parts/DevTools.ShowDebugLink.ascx
index 361baeaa0..b5ced4224 100644
--- a/src/Orchard.Web/Packages/Orchard.DevTools/Views/DisplayTemplates/Parts/DevTools.ShowDebugLink.ascx
+++ b/src/Orchard.Web/Packages/Orchard.DevTools/Views/DisplayTemplates/Parts/DevTools.ShowDebugLink.ascx
@@ -1,5 +1,6 @@
-<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<ShowDebugLink>" %>
+<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<ShowDebugLink>" %>
 <%@ Import Namespace="Orchard.DevTools.Models" %>
-<div class="debug message">
-    DevTools: showing
-    <%= Html.ActionLink(Model.ContentItem.ContentType + " #" + Model.ContentItem.Id + " v" + Model.ContentItem.Version, "details", "content", new { area = "Orchard.DevTools", Model.ContentItem.Id, Model.ContentItem.Version }, new { })%></div>
+<div class="debug message"><%=T(
+    "DevTools: editing {0}",
+    Html.ActionLink(T("{0} #{1} v{2}", Model.ContentItem.ContentType, Model.ContentItem.Id, Model.ContentItem.Version).ToString(), "details", "content", new { area = "Orchard.DevTools", Model.ContentItem.Id, Model.ContentItem.Version }, new { })
+    ) %></div>
diff --git a/src/Orchard.Web/Packages/Orchard.DevTools/Views/EditorTemplates/Parts/DevTools.ShowDebugLink.ascx b/src/Orchard.Web/Packages/Orchard.DevTools/Views/EditorTemplates/Parts/DevTools.ShowDebugLink.ascx
index 06f59c866..9cff57c5e 100644
--- a/src/Orchard.Web/Packages/Orchard.DevTools/Views/EditorTemplates/Parts/DevTools.ShowDebugLink.ascx
+++ b/src/Orchard.Web/Packages/Orchard.DevTools/Views/EditorTemplates/Parts/DevTools.ShowDebugLink.ascx
@@ -1,7 +1,8 @@
-<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<ShowDebugLink>" %>
+<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<ShowDebugLink>" %>
 <%@ Import Namespace="Orchard.DevTools.Models" %>
 <% if (Model.ContentItem.Id > 0) { %>
-<div class="debug message">
-    DevTools: editing
-    <%= Html.ActionLink(Model.ContentItem.ContentType + " #" + Model.ContentItem.Id + " v" + Model.ContentItem.Version, "details", "content", new { area = "Orchard.DevTools", Model.ContentItem.Id, Model.ContentItem.Version }, new { })%></div>
+<div class="debug message"><%=T(
+    "DevTools: editing {0}",
+    Html.ActionLink(T("{0} #{1} v{2}", Model.ContentItem.ContentType, Model.ContentItem.Id, Model.ContentItem.Version).ToString(), "details", "content", new { area = "Orchard.DevTools", Model.ContentItem.Id, Model.ContentItem.Version }, new { })
+    ) %></div>
 <% } %>
diff --git a/src/Orchard.Web/Packages/Orchard.DevTools/Views/Home/Index.aspx b/src/Orchard.Web/Packages/Orchard.DevTools/Views/Home/Index.aspx
index b69f4773b..741c0cb7a 100644
--- a/src/Orchard.Web/Packages/Orchard.DevTools/Views/Home/Index.aspx
+++ b/src/Orchard.Web/Packages/Orchard.DevTools/Views/Home/Index.aspx
@@ -1,5 +1,5 @@
-<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<BaseViewModel>" %>
+<%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage<BaseViewModel>" %>
 <%@ Import Namespace="Orchard.Mvc.ViewModels"%>
-<h1><%=Html.TitleForPage("Dev Tools") %></h1>
-<p><%=Html.ActionLink("Contents", "Index", "Content") %></p>
-<p><%=Html.ActionLink("Test Unauthorized Request", "NotAuthorized", "Home")%></p>
+<h1><%=Html.TitleForPage(T("Dev Tools").ToString()) %></h1>
+<p><%=Html.ActionLink(T("Contents").ToString(), "Index", "Content") %></p>
+<p><%=Html.ActionLink(T("Test Unauthorized Request").ToString(), "NotAuthorized", "Home")%></p>
diff --git a/src/Orchard/UI/PageClass/IPageClassBuilder.cs b/src/Orchard/UI/PageClass/IPageClassBuilder.cs
index 6c11d27a5..14b7759c0 100644
--- a/src/Orchard/UI/PageClass/IPageClassBuilder.cs
+++ b/src/Orchard/UI/PageClass/IPageClassBuilder.cs
@@ -1,5 +1,5 @@
 namespace Orchard.UI.PageClass {
     public interface IPageClassBuilder : IDependency {
-        void AddClassNames(params object[] titleParts);
+        void AddClassNames(params object[] classNames);
     }
 }
\ No newline at end of file