diff --git a/src/Orchard.Web/Modules/Orchard.Search/Drivers/SearchSettingsPartDriver.cs b/src/Orchard.Web/Modules/Orchard.Search/Drivers/SearchSettingsPartDriver.cs
index 369c6e7ed..638905e61 100644
--- a/src/Orchard.Web/Modules/Orchard.Search/Drivers/SearchSettingsPartDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.Search/Drivers/SearchSettingsPartDriver.cs
@@ -24,8 +24,8 @@ namespace Orchard.Search.Drivers {
         protected override string Prefix { get { return "SearchSettings"; } }
 
         protected override DriverResult Editor(SearchSettingsPart part, dynamic shapeHelper) {
-            var model = new SearchSettingsViewModel();
-            var searchedFields = part.SearchedFields;
+            SearchSettingsViewModel model = new SearchSettingsViewModel();
+            String [] searchedFields = part.SearchedFields;
 
             if (_indexManager.HasIndexProvider()) {
                 model.Entries = new List<SearchSettingsEntry>();
@@ -34,13 +34,14 @@ namespace Orchard.Search.Drivers {
                 }
             }
 
-            return ContentPartTemplate(model, "Parts/Search.SiteSettings");
+            return ContentShape("Parts_Search_SiteSettings",
+                                () => shapeHelper.EditorTemplate(TemplateName: "Parts/Search.SiteSettings", Model: model));
         }
 
         protected override DriverResult Editor(SearchSettingsPart part, IUpdateModel updater, dynamic shapeHelper) {
-            var model = new SearchSettingsViewModel();
-            
-            if(updater.TryUpdateModel(model, Prefix, null, null)) {
+            SearchSettingsViewModel model = new SearchSettingsViewModel();
+
+            if (updater.TryUpdateModel(model, Prefix, null, null)) {
                 part.SearchedFields = model.Entries.Where(e => e.Selected).Select(e => e.Field).ToArray();
             }
 
diff --git a/src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj b/src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj
index c9f772b90..f6b0ad474 100644
--- a/src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj
@@ -106,6 +106,9 @@
   <ItemGroup>
     <Content Include="Views\Parts\Search.SearchForm.cshtml" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="Placement.info" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/src/Orchard.Web/Modules/Orchard.Search/Placement.info b/src/Orchard.Web/Modules/Orchard.Search/Placement.info
new file mode 100644
index 000000000..e0cc312db
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Search/Placement.info
@@ -0,0 +1,3 @@
+<Placement>
+    <Place Parts_Search_SiteSettings="Primary:1"/>
+</Placement>
diff --git a/src/Orchard.Web/Modules/Orchard.Search/Views/EditorTemplates/Parts/Search.SiteSettings.cshtml b/src/Orchard.Web/Modules/Orchard.Search/Views/EditorTemplates/Parts/Search.SiteSettings.cshtml
index 09a76ab1e..0c8bb4ef4 100644
--- a/src/Orchard.Web/Modules/Orchard.Search/Views/EditorTemplates/Parts/Search.SiteSettings.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Search/Views/EditorTemplates/Parts/Search.SiteSettings.cshtml
@@ -4,18 +4,16 @@
 <fieldset>
     <legend>@T("Search")</legend>
     <div>
-        @{var entryIndex = 0;}
         @if (Model.Entries != null && Model.Entries.Any()) {
-            foreach(var modelEntry in Model.Entries) {
-               if(Model.Entries[entryIndex].Selected) {
-                   <input type="checkbox" value="true" checked="checked" name="@Html.FieldNameFor(m => m.Entries[entryIndex].Selected)" id="@Html.FieldIdFor(m => m.Entries[entryIndex].Selected)"/> 
+            foreach(SearchSettingsEntry modelEntry in Model.Entries) {
+               if(modelEntry.Selected) {
+                   <input type="checkbox" value="true" checked="checked" name="@Html.FieldNameFor(m => modelEntry.Selected)" id="@Html.FieldIdFor(m => modelEntry.Selected)"/> 
                }
                else {
-                   <input type="checkbox" value="true" name="@Html.FieldNameFor(m => m.Entries[entryIndex].Selected)" id="@Html.FieldIdFor(m => m.Entries[entryIndex].Selected)"/> 
+                   <input type="checkbox" value="true" name="@Html.FieldNameFor(m => modelEntry.Selected)" id="@Html.FieldIdFor(m => modelEntry.Selected)"/> 
                }
-               @Html.HiddenFor(m => m.Entries[entryIndex].Field)
-               <label class="forcheckbox" for="@Html.FieldIdFor(m => m.Entries[entryIndex].Selected)">@Model.Entries[entryIndex].Field</label>
-               entryIndex = entryIndex + 1;
+               @Html.HiddenFor(m => modelEntry.Field)
+               <label class="forcheckbox" for="@Html.FieldIdFor(m => modelEntry.Selected)">@modelEntry.Field</label>
             }
         }
         else {
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Views/EditorTemplates/Parts/Widgets.LayerPart.cshtml b/src/Orchard.Web/Modules/Orchard.Widgets/Views/EditorTemplates/Parts/Widgets.LayerPart.cshtml
index be3256074..e31e1b67e 100644
--- a/src/Orchard.Web/Modules/Orchard.Widgets/Views/EditorTemplates/Parts/Widgets.LayerPart.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Views/EditorTemplates/Parts/Widgets.LayerPart.cshtml
@@ -1,16 +1,16 @@
 @model Orchard.Widgets.Models.LayerPart
 
 <fieldset>
-	@Html.LabelFor(layer => layer.Name)
-	@Html.TextBoxFor(layer => layer.Name)
+    @Html.LabelFor(layer => layer.Name)
+    @Html.TextBoxFor(layer => layer.Name)
 </fieldset>
 
 <fieldset>
-	@Html.LabelFor(layer => layer.Description)
-	@Html.TextAreaFor(layer => layer.Description)
+    @Html.LabelFor(layer => layer.Description)
+    @Html.TextAreaFor(layer => layer.Description)
 </fieldset>
 
 <fieldset>
-	@Html.LabelFor(layer => layer.LayerRule)
-	@Html.TextAreaFor(layer => layer.LayerRule)
+    @Html.LabelFor(layer => layer.LayerRule)
+    @Html.TextAreaFor(layer => layer.LayerRule)
 </fieldset>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Views/EditorTemplates/Parts/Widgets.WidgetPart.cshtml b/src/Orchard.Web/Modules/Orchard.Widgets/Views/EditorTemplates/Parts/Widgets.WidgetPart.cshtml
index 2e9125f3b..573edadd0 100644
--- a/src/Orchard.Web/Modules/Orchard.Widgets/Views/EditorTemplates/Parts/Widgets.WidgetPart.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Views/EditorTemplates/Parts/Widgets.WidgetPart.cshtml
@@ -2,7 +2,7 @@
 
 <fieldset>
     @Html.LabelFor(widget => widget.Zone)
-	@Html.DropDownListFor(widget => widget.Zone, new SelectList(Model.AvailableZones))
+    @Html.DropDownListFor(widget => widget.Zone, new SelectList(Model.AvailableZones))
 </fieldset>
 
 <fieldset>