\ No newline at end of file
+ <% end_loop %>
+
diff --git a/admin/templates/Includes/Editor_toolbar.ss b/admin/templates/Includes/Editor_toolbar.ss
index bc991b185..773877982 100644
--- a/admin/templates/Includes/Editor_toolbar.ss
+++ b/admin/templates/Includes/Editor_toolbar.ss
@@ -1,15 +1,11 @@
-<% control EditorToolbar %>
+<% with EditorToolbar %>
@@ -52,4 +52,4 @@
»«
-
\ No newline at end of file
+
diff --git a/admin/templates/Includes/LeftAndMain_SilverStripeNavigator.ss b/admin/templates/Includes/LeftAndMain_SilverStripeNavigator.ss
index 3ec525e40..2640cfebe 100644
--- a/admin/templates/Includes/LeftAndMain_SilverStripeNavigator.ss
+++ b/admin/templates/Includes/LeftAndMain_SilverStripeNavigator.ss
@@ -3,10 +3,10 @@
« <% _t('SilverStripeNavigator.Edit', 'Edit') %>
- <% control Items %>
+ <% loop Items %>
$HTML
<% if Watermark %>$Watermark<% end_if %>
- <% end_control %>
+ <% end_loop %>
-
\ No newline at end of file
+
diff --git a/admin/templates/Includes/ModelAdmin_Content.ss b/admin/templates/Includes/ModelAdmin_Content.ss
index 991705d30..08a165e77 100644
--- a/admin/templates/Includes/ModelAdmin_Content.ss
+++ b/admin/templates/Includes/ModelAdmin_Content.ss
@@ -13,11 +13,11 @@
- <% control ManagedModelTabs %>
+ <% loop ManagedModelTabs %>
\ No newline at end of file
+
diff --git a/templates/Includes/GridField_print.ss b/templates/Includes/GridField_print.ss
index 20b61155e..df1a9779c 100644
--- a/templates/Includes/GridField_print.ss
+++ b/templates/Includes/GridField_print.ss
@@ -7,12 +7,12 @@
<% if $Title %>