diff --git a/booking.mailtemplate_admin.inc b/booking.mailtemplate_admin.inc
index 36e44d5..899a45c 100644
--- a/booking.mailtemplate_admin.inc
+++ b/booking.mailtemplate_admin.inc
@@ -22,11 +22,28 @@
   //watchdog('booking_debug', "<pre>Mail template navigation links loaded\n@info</pre>", array('@info' => print_r($header_links, true)));
   //watchdog('booking_debug', "<pre>Mail template social links loaded\n@info</pre>", array('@info' => print_r($social_links, true)));
 
+  $form['booking_mailtemplate_header_image_url'] = array (
+    '#type' => 'textfield',
+    '#title' => t('URL of header image'),
+    '#description' => t('Specify full URL to image used in header'),
+    '#size' => 150,	
+    '#maxlength' => 500,
+    '#default_value' => empty($colors['booking_mailtemplate_header_image_url']) ? $GLOBALS['base_url'] . '/sites/all/modules/booking/images/logo.png' : $colors['booking_mailtemplate_header_image_url'],
+  );
+  $form['booking_mailtemplate_header_link_url'] = array (
+    '#type' => 'textfield',
+    '#title' => t('Destination URL for header'),
+    '#description' => t('Specify full URL to direct user if they click on header image'),
+    '#size' => 150,	
+    '#maxlength' => 500,
+    '#default_value' => empty($colors['booking_mailtemplate_header_link_url']) ? $GLOBALS['base_url'] : $colors['booking_mailtemplate_header_link_url'],
+  );  
+
   $form['colors'] = array(
     '#type' => 'fieldset',
     '#title' => 'Define Colours',
     '#collapsible' => TRUE, 
-    '#collapsed' => FALSE,
+    '#collapsed' => TRUE,
   );
   $form['colors']['booking_mailtemplate_background_color'] = array (
     '#type' => 'textfield',
@@ -86,22 +103,6 @@
     '#default_value' => empty($colors['booking_mailtemplate_link_color']) ? '#FFFFFF' : $colors['booking_mailtemplate_link_color'],
   );
   */
-  $form['booking_mailtemplate_header_image_url'] = array (
-    '#type' => 'textfield',
-    '#title' => t('URL of header image'),
-    '#description' => t('Specify full URL to image used in header'),
-    '#size' => 150,	
-    '#maxlength' => 500,
-    '#default_value' => empty($colors['booking_mailtemplate_header_image_url']) ? $GLOBALS['base_url'] . '/sites/all/modules/booking/images/logo.png' : $colors['booking_mailtemplate_header_image_url'],
-  );
-  $form['booking_mailtemplate_header_link_url'] = array (
-    '#type' => 'textfield',
-    '#title' => t('Destination URL for header'),
-    '#description' => t('Specify full URL to direct user if they click on header image'),
-    '#size' => 150,	
-    '#maxlength' => 500,
-    '#default_value' => empty($colors['booking_mailtemplate_header_link_url']) ? $GLOBALS['base_url'] : $colors['booking_mailtemplate_header_link_url'],
-  );
 
   $form['header-links'] = array(
     '#type' => 'fieldset',