6 files changed, 6 insertions, 8 deletions
diff --git a/views/default/core/river/controls.php b/views/default/core/river/controls.php
index 21ce8414c..9c3305635 100644
--- a/views/default/core/river/controls.php
+++ b/views/default/core/river/controls.php
@@ -16,8 +16,7 @@ if (elgg_is_logged_in()) {
 			$params = array(
 				'href' => '#',
 				'text' => elgg_echo('generic_comments:text'),
-				'class' => 'elgg-toggle',
-				'id' => "elgg-toggler-{$object->getGUID()}",
+				'class' => "elgg-toggler elgg-toggles-comments-add-{$object->getGUID()}",
 			);
 			echo elgg_view('output/url', $params);
 		}
diff --git a/views/default/core/river/footer.php b/views/default/core/river/footer.php
index d4d01e57c..7cf9dd925 100644
--- a/views/default/core/river/footer.php
+++ b/views/default/core/river/footer.php
@@ -48,5 +48,5 @@ if ($comments) {
 
 // inline comment form
 echo elgg_view_form('comments/add', array(
-	'id' => "elgg-togglee-{$object->getGUID()}",
+	'id' => "comments-add-{$object->getGUID()}",
 ), array('entity' => $object, 'inline' => true));
diff --git a/views/default/object/widget/elements/controls.php b/views/default/object/widget/elements/controls.php
index 09f5fc947..39eba471a 100644
--- a/views/default/object/widget/elements/controls.php
+++ b/views/default/object/widget/elements/controls.php
@@ -33,8 +33,7 @@ if ($widget->canEdit()) {
 			'text' => ' ',
 			'title' => elgg_echo('widget:edit'),
 			'href' => "#",
-			'class' => 'elgg-widget-edit-button elgg-toggle',
-			'id' => "elgg-toggler-widget-$widget->guid"
+			'class' => "elgg-widget-edit-button elgg-toggler elgg-toggles-widget-edit-$widget->guid",
 		);
 		$edit_link = elgg_view('output/url', $params);
 	}
diff --git a/views/default/object/widget/elements/settings.php b/views/default/object/widget/elements/settings.php
index 05cc7b5ce..5afe56ed8 100644
--- a/views/default/object/widget/elements/settings.php
+++ b/views/default/object/widget/elements/settings.php
@@ -8,6 +8,6 @@
 $widget = elgg_extract('widget', $vars);
 ?>
 
-<div class="elgg-widget-edit" id="elgg-togglee-widget-<?php echo $widget->guid; ?>">
+<div class="elgg-widget-edit" id="widget-edit-<?php echo $widget->guid; ?>">
 	<?php echo elgg_view_form('widgets/save', array(), $vars); ?>
 </div>
diff --git a/views/default/page/layouts/widgets/add_button.php b/views/default/page/layouts/widgets/add_button.php
index 0304c50a0..23c0b99ee 100644
--- a/views/default/page/layouts/widgets/add_button.php
+++ b/views/default/page/layouts/widgets/add_button.php
@@ -4,7 +4,7 @@
  */
 ?>
 <div class="elgg-widget-add-control">
-	<a class="elgg-button-action elgg-toggle" id="elgg-toggler-add-widgets">
+	<a class="elgg-button-action elgg-toggler elgg-toggles-widgets-add-panel">
 		<?php echo elgg_echo('widgets:add'); ?>
 	</a>
 </div>
diff --git a/views/default/page/layouts/widgets/add_panel.php b/views/default/page/layouts/widgets/add_panel.php
index 38c133c4a..2786e83b2 100644
--- a/views/default/page/layouts/widgets/add_panel.php
+++ b/views/default/page/layouts/widgets/add_panel.php
@@ -21,7 +21,7 @@ foreach ($widgets as $column_widgets) {
 }
 
 ?>
-<div class="elgg-widgets-add-panel hidden clearfix" id="elgg-togglee-add-widgets">
+<div class="elgg-widgets-add-panel hidden clearfix" id="widgets-add-panel">
 	<p>
 		<?php echo elgg_echo('widgets:add:description'); ?>
 	</p>