diff -urp signup_pay_orig/signup_pay.module signup_pay/signup_pay.module
--- signup_pay_orig/signup_pay.module	2008-03-25 23:12:04.000000000 -0500
+++ signup_pay/signup_pay.module	2008-03-26 10:50:08.000000000 -0500
@@ -53,47 +53,75 @@ function signup_pay_get_currency() {
 }
 
 function signup_pay_settings() {
-	$form[SIGNUP_PAY_ENABLED] = array(
+	$form['signup_pay_general'] = array(
+		'#type'						=> 'fieldset',
+		'#title' 					=> t('General Configuration'),
+		
+		);
+	$form['signup_pay_general'][SIGNUP_PAY_ENABLED] = array(
 		'#type' 					=> 'checkbox',
-		'#title'					=> t('Use payment for signup on all new signup enabled nodes by default'),
+		'#title'					=> t('Enable payment on signup for all new signup enabled nodes by default'),
 		'#default_value'	=> variable_get(SIGNUP_PAY_ENABLED, SIGNUP_PAY_DEFAULT_ENABLED),
 		);
-
-  $form[SIGNUP_PAY_EMAIL] = array(
+  $form['signup_pay_general'][SIGNUP_PAY_EMAIL] = array(
     '#type' => 'textfield',
-    '#title' => t('Payment email address'),
+    '#title' => t('Paypal email address'),
     '#default_value' => variable_get(SIGNUP_PAY_EMAIL, SIGNUP_PAY_DEFAULT_EMAIL),
-    '#description' => t('Email address to send Paypal payments to.'),
+    '#description' => t('If using PayPal to collect payments please specify your PayPal e-mail address.'),
   );
-
-  $form[SIGNUP_PAY_AMOUNT] = array(
+  $form['signup_pay_general'][SIGNUP_PAY_AMOUNT] = array(
     '#type'           => 'textfield',
     '#title'          => t('Default amount to charge, per node'),
     '#default_value'  => variable_get(SIGNUP_PAY_AMOUNT, SIGNUP_PAY_DEFAULT_AMOUNT),
-    '#description' => t('Default amount to charge from each user, per node. Do not change this after the first person pays.'),
+    '#description' => t('Default amount to charge each user. This can be changed on individual nodes. Do not change this after the first person pays.'),
     );
-
-  $form[SIGNUP_PAY_CURRENCY] = array(
+  $form['signup_pay_general'][SIGNUP_PAY_CURRENCY] = array(
     '#type'           => 'select',
-    '#title'          => t('Currency'),
+    '#title'          => t('Default Currency'),
     '#default_value'  => variable_get(SIGNUP_PAY_CURRENCY, SIGNUP_PAY_DEFAULT_CURRENCY),
     '#options'        => signup_pay_get_currency(),
-    '#description' => t('Default currency for the amount to collect.'),
     );
+  //TODO stronger admin features per role for default price and weighting for selecting correct amount
 
-  $form[SIGNUP_PAY_RECEIPT_PAGE] = array(
+  $roles = user_roles(TRUE, 'sign up for content');
+  $role_description = array();
+  $default_role_description = array();
+  foreach ($roles as $key => $value) {
+    $role_description[] = $key." = ".$value;
+    $default_role_description[] = $key;
+  }
+  $form['signup_pay_general'][SIGNUP_PAY_ROLE_WEIGHT] = array(
+    '#type'           => 'textfield',
+    '#title'          => t('Role Weight'),
+    '#default_value'  => variable_get(SIGNUP_PAY_ROLE_WEIGHT, implode(", ", $default_role_description)),
+    '#description'    => t('KEY [@legend]<br>Order the roles to prioritize thier use when determining the price to pay for signups. For now, enter the ID of the role in the order you would like them used.', array('@legend' => implode(", ", $role_description))),
+  );
+	
+	$form['signup_pay_reciept_fieldset'] = array(
+		'#type'						=> 'fieldset',
+		'#title' 					=> t('Template for receipt page'),
+		'#collapsible'		=> TRUE,
+		'#collapsed'			=> TRUE,
+		'#description' => t('Template for receipt when displayed on the web site as a page. You can use any HTML, including the following tokens Date: @date, Payment method: @method, Amount: @amount, Name: @name, Email: @mail'),
+		);
+  $form['signup_pay_reciept_fieldset'][SIGNUP_PAY_RECEIPT_PAGE] = array(
     '#type'           => 'textarea',
     '#title'          => t('Template for receipt page'),
     '#default_value'  => variable_get(SIGNUP_PAY_RECEIPT_PAGE, SIGNUP_PAY_DEFAULT_RECEIPT),
-    '#description' => t('Template for receipt when displayed on the web site as a page. You can use any HTML, including the following tokens Date: @date, Payment method: @method, Amount: @amount, Name: @name, Email: @mail'),
     );
 
-  $form[SIGNUP_PAY_RECEIPT_EMAIL] = array(
-    '#type'           => 'textarea',
+	$form['signup_pay_reciept_email_fieldset'] = array(
+		'#type'						=> 'fieldset',
     '#title'          => t('Template for receipt email'),
-    '#default_value'  => variable_get(SIGNUP_PAY_RECEIPT_EMAIL, SIGNUP_PAY_DEFAULT_RECEIPT),
+		'#collapsible'		=> TRUE,
+		'#collapsed'			=> TRUE,
     '#description' => t('Template for receipt when emailed to the user. You can use any HTML, including the following tokens Date: @date, Payment method: @method, Amount: @amount, Name: @name, Email: @mail'),
+		);
+  $form['signup_pay_reciept_email_fieldset'][SIGNUP_PAY_RECEIPT_EMAIL] = array(
+    '#type'           => 'textarea',
+    '#default_value'  => variable_get(SIGNUP_PAY_RECEIPT_EMAIL, SIGNUP_PAY_DEFAULT_RECEIPT),
     );
+
   if (module_exists('signup_status')) {
     $access = user_access('administer site configuration');
     if ($access) {
@@ -103,7 +131,11 @@ function signup_pay_settings() {
     foreach (signup_status_codes() as $cid => $code) {
       $options[$cid] = $code['name'];
     }
-    $form[SIGNUP_PAY_PAID_STATUS_CODE] = array(
+		$form['signup_pay_status_fieldset'] = array(
+			'#type' 					=> 'fieldset',
+			'#title' 					=> t('Signup Status Configuration'),
+			);
+    $form['signup_pay_status_fieldset'][SIGNUP_PAY_PAID_STATUS_CODE] = array(
       '#type'           => 'select',
       '#title'          => t('Paid Status Code'),
       '#options'        => $options,
@@ -111,21 +143,6 @@ function signup_pay_settings() {
       '#description'    => t('Select the status code which will be used when a payment transaction is completed successfully. @link', array('@link' => $create_link)),
     );
   }
-  //TODO stronger admin features per role for default price and weighting for selecting correct amount
-  
-  $roles = user_roles(TRUE, 'sign up for content');
-  $role_description = array();
-  $default_role_description = array();
-  foreach ($roles as $key => $value) {
-    $role_description[] = $key." = ".$value;
-    $default_role_description[] = $key;
-  }
-  $form[SIGNUP_PAY_ROLE_WEIGHT] = array(
-    '#type'           => 'textfield',
-    '#title'          => t('Role Weight'),
-    '#default_value'  => variable_get(SIGNUP_PAY_ROLE_WEIGHT, implode(", ", $default_role_description)),
-    '#description'    => t('KEY [@legend]<br>Order the roles to prioritize thier use when determining the price to pay for signups. For now, enter the ID of the role in the order you would like them used.', array('@legend' => implode(", ", $role_description))),
-  );
 
   return system_settings_form($form);
 }