--- annotate.module	2009-11-19 11:37:28.000000000 -0500
+++ annotate.module	2009-11-18 14:56:16.000000000 -0500
@@ -99,6 +99,8 @@ function annotate_admin_settings() {
   $form['multi']= array(
       '#type' => 'fieldset',
       '#title' => t('Multiple Annotations'),
+       '#prefix' => '<div class="annotation-fieldset">',
+  		'#suffix' => '</div>',
     );
   // TODO: validate with annotate_nodetypes
   $form['multi']['annotate_show_multi_expanded'] = array(
@@ -227,6 +229,8 @@ function _annotate_forms( $node) {
         '#title' => theme('annotate_fieldset_title', $note),
         '#collapsible' => TRUE,
         '#collapsed' => !$note->note && !variable_get('annotate_show_expanded', '0'),
+         '#prefix' => '<div class="annotation-fieldset">',
+  		'#suffix' => '</div>',
       );
       _annotate_prepare_view_item( $note);
       $form['annotate']['note'] = array(
@@ -243,9 +247,11 @@ function _annotate_forms( $node) {
   	$form=array();
     $form['annotates_private'] = array(
       '#type' => 'fieldset',
-      '#title' => t('Annotations') . ' : ' . (count($node->notes) - 1),
+      '#title' => t('Annotations') . ' (' . (count($node->notes) - 1) . ')',
       '#collapsible' => TRUE,
       '#collapsed' => !variable_get('annotate_show_multi_expanded', '0'),
+       '#prefix' => '<div class="annotation-fieldset">',
+  		'#suffix' => '</div>',
     );
     $form['annotates_private']['forms'] = array(
       '#type' => 'markup',
@@ -328,6 +334,8 @@ function annotate_private_entry_form($fo
     '#title' => theme('annotate_fieldset_title', $note),
     '#collapsible' => TRUE,
     '#collapsed' => !$note->note && !variable_get('annotate_show_expanded', '0'),
+    '#prefix' => '<div class="annotation-form-elements">',
+  	'#suffix' => '</div>',
   );
   
   $form['annotate']['timestamp'] = array(