diff --git a/admin/panels/widgets/admin.widgets.default.php b/admin/panels/widgets/admin.widgets.default.php
index dd0a342..b493320 100644
--- a/admin/panels/widgets/admin.widgets.default.php
+++ b/admin/panels/widgets/admin.widgets.default.php
@@ -105,8 +105,8 @@
 		
 
 		function onsave() {
-		
-			$fp_widgets = isset($_POST['widgets'])? $_POST['widgets'] : array(); 			
+
+			$fp_widgets = isset($_POST['widgets'])? $_POST['widgets'] : array(); 	
 			$success = system_save(CONFIG_DIR . 'widgets.conf.php', compact('fp_widgets'));
 
 			$this->smarty->assign('success', ( $success )? 1 : -1 );
diff --git a/admin/panels/widgets/admin.widgets.tpl b/admin/panels/widgets/admin.widgets.default.tpl
similarity index 98%
rename from admin/panels/widgets/admin.widgets.tpl
rename to admin/panels/widgets/admin.widgets.default.tpl
index 506a42b..2f70544 100755
--- a/admin/panels/widgets/admin.widgets.tpl
+++ b/admin/panels/widgets/admin.widgets.default.tpl
@@ -4,7 +4,7 @@
 {include file='shared:errorlist.tpl'}
 
 
-{html_form}
+{html_form id="admin-widgets-default"}
 	
 	<div id="available-widgets">
 	<h2>{$panelstrings.availwdgs}</h2>
diff --git a/admin/panels/widgets/admin.widgets.js b/admin/panels/widgets/admin.widgets.js
index 317ab21..17c399d 100644
--- a/admin/panels/widgets/admin.widgets.js
+++ b/admin/panels/widgets/admin.widgets.js
@@ -15,8 +15,7 @@
 				{'handle': $$('#available-widgets h3')[0]}
 		);
 		*/
-		
-		
+	
 		Drag.MultiDrop = Drag.Move.extend({
 			drag:       function(event) {
 				this.droppables = Widgets.droppables;
@@ -147,7 +146,7 @@
 						
 							
 							parentid = drop.getParent().id;
-							widgetsetid = /^widgetsetid-(.*)$/(parentid);
+							 widgetsetid = /^widgetsetid-(.*)$/.exec(parentid);
 							
 							input = dropped.getChildren().filterByClass('widget-id')[0];
 							input.set({