diff --git a/code/WidgetAreaEditor.php b/code/WidgetAreaEditor.php
index dd4a6d1a..c862df48 100644
--- a/code/WidgetAreaEditor.php
+++ b/code/WidgetAreaEditor.php
@@ -5,6 +5,10 @@
  * @subpackage content
  */
 class WidgetAreaEditor extends FormField {
+	function __construct($name) {
+		parent::__construct($name);
+	}
+	
 	function FieldHolder() {
 		Requirements::css(CMS_DIR . '/css/WidgetAreaEditor.css');
 		Requirements::javascript(CMS_DIR . '/javascript/WidgetAreaEditor.js');
@@ -26,7 +30,7 @@ class WidgetAreaEditor extends FormField {
 	
 	function UsedWidgets() {
 		$relationName = $this->name;
-		$widgets = $this->form->getRecord()->getComponent($relationName)->Widgets();
+		$widgets = $this->form->getRecord()->getComponent($relationName)->Items();
 		return $widgets;
 	}
 	
@@ -48,7 +52,7 @@ class WidgetAreaEditor extends FormField {
 		
 		$record->$idName = $widgetarea->ID;
 	
-		$widgets = $widgetarea->Widgets();
+		$widgets = $widgetarea->Items();
 	
 		// store the field IDs and delete the missing fields
 		// alternatively, we could delete all the fields and re add them
diff --git a/javascript/WidgetAreaEditor.js b/javascript/WidgetAreaEditor.js
index 02e2deb1..213acdf3 100644
--- a/javascript/WidgetAreaEditor.js
+++ b/javascript/WidgetAreaEditor.js
@@ -160,6 +160,10 @@ WidgetAreaEditorClass.prototype = {
 		$('usedWidgets-'+this.name).parentNode.parentNode.rewriteWidgetAreaAttributes();
 		UsedWidget.applyToChildren($('usedWidgets-'+this.name), 'div.Widget');
 		
+		// Repply some common form controls
+		WidgetTreeDropdownField.applyTo('div.usedWidgets .TreeDropdownField');
+		
+		
 		Sortable.create('usedWidgets-SideBar', {
 			tag: 'div',
 			handle: 'handle',
@@ -231,6 +235,15 @@ UsedWidget.prototype = {
 	}
 }
 
+WidgetTreeDropdownField = Class.extend('TreeDropdownField');
+WidgetTreeDropdownField.prototype = {
+	getName: function() {
+		return 'Widget_TDF_Endpoint';
+	}
+}
+
+WidgetTreeDropdownField.applyTo('div.usedWidgets .TreeDropdownField');
+
 // Loop over all WidgetAreas and fire 'em up
 var wAs = $$('.WidgetAreaEditor');
 for(var i = 0; i < wAs.length; i++) {
diff --git a/templates/WidgetAreaEditor.ss b/templates/WidgetAreaEditor.ss
index 187e33e4..6b1989f6 100644
--- a/templates/WidgetAreaEditor.ss
+++ b/templates/WidgetAreaEditor.ss
@@ -17,7 +17,7 @@
 	</div>
 	<div class="usedWidgetsHolder">
 		<h2><% _t('INUSE', 'Widgets currently used') %></h2>
-		<p><% _t('TOADD', 'To add widgets, drag them from the left area to here.') %></p>
+		<p><% _t('TOADD', 'To add widgets, click on the purple header on the left') %></p>
 		
 		<div class="usedWidgets" id="usedWidgets-$Name">
 			<% if UsedWidgets %>