diff --git a/booking.variety_form.inc b/booking.variety_form.inc
index 4b9eef4..6779886 100644
--- a/booking.variety_form.inc
+++ b/booking.variety_form.inc
@@ -20,7 +20,12 @@ function booking_variety_regn_form($node, &$form_state)
   $timeslot_query->condition('v.booking_eventid', $event->eid, '=')
     ->fields('v')
     ->orderBy('v.booking_variety_start');
-  $result = $timeslot_query->execute();            
+  $result = $timeslot_query->execute();    
+  
+  $form['wrapper'] = array(
+    '#prefix' => '<div id="booking_variety_form_wrapper">',
+    '#suffix' => '</div>'
+  );
 
   $form['identity'] = array(
     '#type' => 'fieldset',
@@ -36,7 +41,7 @@ function booking_variety_regn_form($node, &$form_state)
     '#default_value' => !empty($data->booking_nid) ? $data->booking_nid : '',
     '#ajax' => array(
       'event' => 'change',
-      'wrapper' => 'booking_variety_session_fieldset_wrapper',
+      'wrapper' => 'booking_variety_form_wrapper',
       'callback' => 'booking_variety_session_form_callback',
     ),	      
   );
@@ -50,7 +55,7 @@ function booking_variety_regn_form($node, &$form_state)
     '#default_value' => !empty($data->booking_lastname) ? $data->booking_lastname : '',
     '#ajax' => array(
       'event' => 'change',
-      'wrapper' => 'booking_variety_session_fieldset_wrapper',
+      'wrapper' => 'booking_variety_form_wrapper',
       'callback' => 'booking_variety_session_form_callback',
     ),	      
   );  
@@ -58,11 +63,11 @@ function booking_variety_regn_form($node, &$form_state)
   $form['variety-sessions'] = array(
     '#type' => 'fieldset',
     '#title' => 'Select Variety Sessions',
-    '#prefix' => '<div id="booking_variety_session_fieldset_wrapper">',
-    '#suffix' => '</div>'
+    //'#prefix' => '<div id="booking_variety_session_fieldset_wrapper">',
+    //'#suffix' => '</div>'
   );  
 
-  $form['variety-sessions']['booking_feedback_wrapper'] = array(
+  $form['identity']['booking_feedback_wrapper'] = array(
     '#markup' => '<div id="booking_feedback_wrapper"></div>',
   );   
 
@@ -122,8 +127,10 @@ function _booking_get_variety_timeslot_options($timeslot_id) {
  */
 function booking_variety_session_form_callback($form, &$form_state) {
   $form_state['rebuild'] = TRUE;
-  $form['form']['variety-sessions']['booking_feedback_wrapper']['#markup'] = '<div id="booking_feedback_wrapper">Test</div>';
-  return $form['form']['variety-sessions'];
+  //$form['form']['variety-sessions']['booking_feedback_wrapper']['#markup'] = '<div id="booking_feedback_wrapper">Test</div>';
+  //return $form['form']['variety-sessions'];
+  $form['form']['identity']['booking_feedback_wrapper']['#markup'] = '<div id="booking_feedback_wrapper">Test</div>';
+  return $form['form'];
 }
 
 /**