diff --git a/remember_me.admin.inc b/remember_me.admin.inc
index 1c482e5..40a29cc 100644
--- a/remember_me.admin.inc
+++ b/remember_me.admin.inc
@@ -11,53 +11,81 @@
 function remember_me_admin_settings($form, &$form_state) {
   global $user;
   $options = drupal_map_assoc(
-    array(3600, 10800, 21600, 43200, 86400, 172800, 259200, 604800, 1209600, 2592000, 5184000, 7776000, 15552000, 31104000),
+    array(0, 3600, 10800, 21600, 43200, 86400, 172800, 259200, 604800, 1209600, 1814400, 2592000, 5184000, 7776000, 15552000, 31104000),
     'format_interval'
   );
 
   $vars = array(
     'remember' => array(
       '#type' => 'item',
-      '#title' => t('Remember me'),
+      '#title' => t('Remember me checked by user at log in?'),
       '#value' => isset($user->data['remember_me']) ? t('Yes') : t('No'),
-      '#description' => t('Current user chose at log in.'),
+      '#description' => t('Was the Remember Me checkbox ticked by the user at log in?'),
     ),
     'session' => array(
       '#type' => 'item',
-      '#title' => t('Session lifetime'),
+      '#title' => t('Current session lifetime:'),
       '#value' => format_interval(ini_get('session.cookie_lifetime')),
       '#description' => t('Currently configured session cookie lifetime.'),
     ),
   );
-  $form['legend'] = array(
+  $form['legend_fieldset'] = array(
+    '#type' => 'fieldset',
+    '#title' => 'Information about current session cookie',
+  );
+
+  $form['legend_fieldset']['legend'] = array(
     '#type' => 'markup',
     '#markup' => theme('remember_me_settings_display', array('vars' => $vars)),
   );
 
-  $form['remember_me_managed'] = array(
+  $form['configure_remember_me'] = array(
+    '#type' => 'fieldset',
+    '#title' => 'Remember Me timeout configuration',
+  );
+
+  $form['configure_remember_me']['remember_me_managed'] = array(
     '#type' => 'checkbox',
-    '#title' => t('Manage session lifetime'),
+    '#title' => t('Enable Remember Me'),
     '#default_value' => variable_get('remember_me_managed', 0),
-    '#description' => t('Choose to manually overwrite the configuration value from settings.php.'),
+    '#description' => t('Override the session lifetime in settings.php with the given length of time for Remember Me.'),
   );
-  $form['remember_me_lifetime'] = array(
+  $form['configure_remember_me']['remember_me_lifetime'] = array(
     '#type' => 'select',
-    '#title' => t('Lifetime'),
+    '#title' => t('Remember Me cookie lifetime'),
     '#default_value' => variable_get('remember_me_lifetime', 604800),
     '#options' => $options,
-    '#description' => t('Duration a user will be remembered for. This setting is ignored if Manage session lifetime (above) is disabled.'),
+    '#description' => t('Duration a user will be remembered for if they check "Remember Me" at login.'),
+    '#states' => array(
+      'invisible' => array(
+        ':input[name="remember_me_managed"]' => array('checked' => FALSE),
+      ),
+    ),
   );
-  $form['remember_me_checkbox'] = array(
+  $form['configure_remember_me']['remember_me_checkbox'] = array(
     '#type' => 'checkbox',
-    '#title' => t('Remember me field'),
+    '#title' => t('Default state of Remember Me checkbox'),
     '#default_value' => variable_get('remember_me_checkbox', 1),
     '#description' => t('Default state of the "Remember me" field on the login forms.'),
+    '#states' => array(
+      'invisible' => array(
+        ':input[name="remember_me_managed"]' => array('checked' => FALSE),
+      ),
+    ),
   );
-  $form['remember_me_checkbox_visible'] = array(
+  $form['configure_remember_me']['remember_me_checkbox_visible'] = array(
     '#type' => 'checkbox',
-    '#title' => t('Remember me field visible'),
+    '#title' => t('Show Remember Me checkbox to user'),
     '#default_value' => variable_get('remember_me_checkbox_visible', 1),
     '#description' => t('Should the "Remember me" field be visible on the login forms.'),
+    '#states' => array(
+      'invisible' => array(
+        ':input[name="remember_me_managed"]' => array('checked' => FALSE),
+      ),
+      'checked' => array(
+        ':input[name="remember_me_managed"]' => array('checked' => TRUE),
+      ),
+    ),
   );
 
   return system_settings_form($form);
@@ -68,21 +96,22 @@ function remember_me_admin_settings($form, &$form_state) {
  */
 function theme_remember_me_settings_display($variables) {
   $rows = array(array());
-  
+
   foreach ($variables['vars'] as $var) {
     $element = array(
       'element' => array(
-          '#type' => 'markup',
-          '#children' => $var['#value'],
-          '#title' => $var['#title'],
-          '#title_display' => 'before',
-      )
+        '#type' => 'markup',
+        '#children' => $var['#value'],
+        '#title' => $var['#title'],
+        '#title_display' => 'before',
+      ),
     );
 
     $output = '<div class="container-inline">' . theme('form_element', $element) . '</div>';
     $output .= '<div class="description">' . $var['#description'] . '</div>';
-    
-    $rows[0][] = array( 'data' => $output);
+
+    $rows[0][] = array('data' => $output);
   }
+
   return theme('table', array('rows' => $rows));
 }