diff --git a/src/Orchard.Web/Core/Messaging/Drivers/MessageSettingsPartDriver.cs b/src/Orchard.Web/Core/Messaging/Drivers/MessageSettingsPartDriver.cs
index 0165185a5..9a12832ee 100644
--- a/src/Orchard.Web/Core/Messaging/Drivers/MessageSettingsPartDriver.cs
+++ b/src/Orchard.Web/Core/Messaging/Drivers/MessageSettingsPartDriver.cs
@@ -9,6 +9,7 @@ using Orchard.Messaging.Services;
 namespace Orchard.Core.Messaging.Drivers {
     [UsedImplicitly]
     public class MessageSettingsPartDriver : ContentPartDriver<MessageSettingsPart> {
+        private const string TemplateName = "Parts/MessageSettings";
         private readonly IMessageManager _messageQueueManager;
         public IOrchardServices Services { get; set; }
 
@@ -29,7 +30,7 @@ namespace Orchard.Core.Messaging.Drivers {
                 MessageSettings = part
             };
 
-            return ContentPartTemplate(model, "Parts/Messaging.MessageSettings");
+            return ContentShape("Parts_MessageSettings_Edit", () => shapeHelper.EditorTemplate(TemplateName: TemplateName, Model: model, Prefix: Prefix));
         }
 
         protected override DriverResult Editor(MessageSettingsPart part, IUpdateModel updater, dynamic shapeHelper) {
@@ -37,10 +38,9 @@ namespace Orchard.Core.Messaging.Drivers {
                 MessageSettings = part
             };
 
-            if (updater.TryUpdateModel(model, Prefix, null, null)) {
-            }
+            updater.TryUpdateModel(model, Prefix, null, null);
 
-            return ContentPartTemplate(model, "Parts/Messaging.MessageSettings");
+            return ContentShape("Parts_MessageSettings_Edit", () => shapeHelper.EditorTemplate(TemplateName: TemplateName, Model: model, Prefix: Prefix));
         }
     }
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Core/Messaging/Migrations.cs b/src/Orchard.Web/Core/Messaging/Migrations.cs
index 375785c3e..92f112256 100644
--- a/src/Orchard.Web/Core/Messaging/Migrations.cs
+++ b/src/Orchard.Web/Core/Messaging/Migrations.cs
@@ -6,8 +6,9 @@ namespace Orchard.Core.Messaging {
         public int Create() {
             SchemaBuilder.CreateTable("MessageSettingsPartRecord", table => table
                 .ContentPartRecord()
-                .Column<string>("DefaultChannelService")
+                .Column<string>("DefaultChannelService", c => c.WithLength(64))
                 );
+
             return 1;
         }
     }
diff --git a/src/Orchard.Web/Core/Messaging/Models/MessageSettingsPart.cs b/src/Orchard.Web/Core/Messaging/Models/MessageSettingsPart.cs
index c624bb20d..5b5303a1e 100644
--- a/src/Orchard.Web/Core/Messaging/Models/MessageSettingsPart.cs
+++ b/src/Orchard.Web/Core/Messaging/Models/MessageSettingsPart.cs
@@ -1,7 +1,10 @@
-using Orchard.ContentManagement;
+using System.ComponentModel.DataAnnotations;
+using Orchard.ContentManagement;
 
 namespace Orchard.Core.Messaging.Models {
     public class MessageSettingsPart : ContentPart<MessageSettingsPartRecord> {
+
+        [StringLength(MessageSettingsPartRecord.DefaultChannelServiceLength)]
         public string DefaultChannelService {
             get { return Record.DefaultChannelService; }
             set { Record.DefaultChannelService = value;  }
diff --git a/src/Orchard.Web/Core/Messaging/Models/MessageSettingsPartRecord.cs b/src/Orchard.Web/Core/Messaging/Models/MessageSettingsPartRecord.cs
index 7d23a9d03..74b16ca78 100644
--- a/src/Orchard.Web/Core/Messaging/Models/MessageSettingsPartRecord.cs
+++ b/src/Orchard.Web/Core/Messaging/Models/MessageSettingsPartRecord.cs
@@ -1,10 +1,14 @@
+using System.ComponentModel.DataAnnotations;
 using Orchard.ContentManagement.Records;
 
 namespace Orchard.Core.Messaging.Models {
     public class MessageSettingsPartRecord : ContentPartRecord {
+        public const ushort DefaultChannelServiceLength = 64;
+
         /// <summary>
         /// Default service used for messages
         /// </summary>
+        [StringLength(DefaultChannelServiceLength)]
         public virtual string DefaultChannelService { get; set; }
     
     }
diff --git a/src/Orchard.Web/Core/Messaging/Placement.info b/src/Orchard.Web/Core/Messaging/Placement.info
new file mode 100644
index 000000000..35c14f610
--- /dev/null
+++ b/src/Orchard.Web/Core/Messaging/Placement.info
@@ -0,0 +1,3 @@
+<Placement>
+    <Place Parts_MessageSettings_Edit="Primary:10"/>
+</Placement>
\ No newline at end of file
diff --git a/src/Orchard.Web/Core/Messaging/Views/EditorTemplates/Parts/Messaging.MessageSettings.cshtml b/src/Orchard.Web/Core/Messaging/Views/EditorTemplates/Parts/MessageSettings.cshtml
similarity index 100%
rename from src/Orchard.Web/Core/Messaging/Views/EditorTemplates/Parts/Messaging.MessageSettings.cshtml
rename to src/Orchard.Web/Core/Messaging/Views/EditorTemplates/Parts/MessageSettings.cshtml
diff --git a/src/Orchard.Web/Core/Orchard.Core.csproj b/src/Orchard.Web/Core/Orchard.Core.csproj
index c3693cfad..a4a8010c7 100644
--- a/src/Orchard.Web/Core/Orchard.Core.csproj
+++ b/src/Orchard.Web/Core/Orchard.Core.csproj
@@ -268,7 +268,7 @@
     <Content Include="Contents\Views\Parts\Contents.Publish.cshtml" />
     <Content Include="Contents\Views\Parts\Contents.Publish.SummaryAdmin.cshtml" />
     <Content Include="Messaging\Module.txt" />
-    <Content Include="Messaging\Views\EditorTemplates\Parts\Messaging.MessageSettings.cshtml" />
+    <Content Include="Messaging\Views\EditorTemplates\Parts\MessageSettings.cshtml" />
     <Content Include="PublishLater\Content\Admin\images\draft.gif" />
     <Content Include="PublishLater\Content\Admin\images\offline.gif" />
     <Content Include="PublishLater\Content\Admin\images\online.gif" />
@@ -382,8 +382,14 @@
     <None Include="Contents\Placement.info" />
     <Content Include="Contents\Views\Content.ControlWrapper.cshtml" />
     <Content Include="Contents\Views\Item\Display.cshtml" />
+    <None Include="Contents\Views\Items\Content.Edit.cshtml" />
     <None Include="Localization\Placement.info" />
-    <None Include="PublishLater\Placement.info" />
+    <Content Include="Messaging\Placement.info">
+      <SubType>Designer</SubType>
+    </Content>
+    <None Include="PublishLater\Placement.info">
+      <SubType>Designer</SubType>
+    </None>
     <Content Include="Routable\Views\Parts\RoutableTitle.cshtml" />
     <None Include="PublishLater\Views\Parts\PublishLater.Metadata.Summary.cshtml" />
     <Content Include="Routable\Views\Item\Display.cshtml" />
diff --git a/src/Orchard.Web/Modules/Orchard.Email/Placement.info b/src/Orchard.Web/Modules/Orchard.Email/Placement.info
index e40e465f2..7f3cf4de5 100644
--- a/src/Orchard.Web/Modules/Orchard.Email/Placement.info
+++ b/src/Orchard.Web/Modules/Orchard.Email/Placement.info
@@ -1,3 +1,3 @@
 <Placement>
-  <Place Parts_SmtpSettings_Editor="Primary:10"/>
+  <Place Parts_SmtpSettings_Edit="Primary:10"/>
 </Placement>
diff --git a/src/Orchard.Web/Modules/Orchard.Modules/Orchard.Modules.csproj b/src/Orchard.Web/Modules/Orchard.Modules/Orchard.Modules.csproj
index 41709e58d..e256af8af 100644
--- a/src/Orchard.Web/Modules/Orchard.Modules/Orchard.Modules.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Modules/Orchard.Modules.csproj
@@ -103,7 +103,7 @@
   <ItemGroup>
     <Content Include="Content\Admin\images\disabled.gif" />
     <Content Include="Content\Admin\images\enabled.gif" />
-    <Content Include="styles\admin.css" />
+    <Content Include="Styles\admin.css" />
     <Content Include="Views\Admin\Features.cshtml" />
     <Content Include="Views\Web.config" />
   </ItemGroup>
diff --git a/src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj b/src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj
index e103d50b0..911af7915 100644
--- a/src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj
@@ -119,7 +119,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Views\Items\User.Editor.cshtml">
+    <Content Include="Views\Items\User.Edit.cshtml">
       <SubType>Designer</SubType>
     </Content>
   </ItemGroup>
diff --git a/src/Orchard.Web/Modules/Orchard.Users/Views/Items/User.Editor.cshtml b/src/Orchard.Web/Modules/Orchard.Users/Views/Items/User.Edit.cshtml
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Users/Views/Items/User.Editor.cshtml
rename to src/Orchard.Web/Modules/Orchard.Users/Views/Items/User.Edit.cshtml
diff --git a/src/Orchard.Web/Themes/TheThemeMachine/Theme.txt b/src/Orchard.Web/Themes/TheThemeMachine/Theme.txt
index 12f3ec41d..a9742c957 100644
--- a/src/Orchard.Web/Themes/TheThemeMachine/Theme.txt
+++ b/src/Orchard.Web/Themes/TheThemeMachine/Theme.txt
@@ -4,4 +4,4 @@ Description: It's a *really* good theme, yo.
 Version: 0.1
 Tags: Awesome
 Website: http://orchardproject.net
-Zones: Header, Navigation, Featured, BeforeMain, Messages, BeforeContent, Content, AfterContent, AfterMain, TripelFirst, TripelSecond, TripelThird, FooterQuadFirst, FooterQuadSecond, FooterQuadThird, FooterQuadFourth, Footer, AsideFirst, AsideSecond
\ No newline at end of file
+Zones: Header, Navigation, Featured, BeforeMain, AsideFirst, Messages, BeforeContent, Content, AfterContent, AsideSecond, AfterMain, TripelFirst, TripelSecond, TripelThird, FooterQuadFirst, FooterQuadSecond, FooterQuadThird, FooterQuadFourth, Footer
\ No newline at end of file