diff --git a/bundle_aggregation.admin.inc b/bundle_aggregation.admin.inc
index 166d61db0ce2abb991b302b10eadf6b4f6398c7a..aae6e63d1a8810661411e6fc8e73a62821939385 100644
--- a/bundle_aggregation.admin.inc
+++ b/bundle_aggregation.admin.inc
@@ -12,7 +12,10 @@ function bundle_aggregation_admin_settings() {
   $form = array();
   $form['bundle_aggregation_enabled'] = array(
     '#title' => t('Bundle aggregation status'),
-    '#description' => t('While inactive the module is not going to interfere with CSS / JS files, so any existing aggregation may work on its own. This allows the administrator to configure the module. Privileged users will be still able to use the aggregation by visiting the pages with the GET parameter bundle_aggregation to test it out and queue up bundles for generation so when the module is enabled the visitors are not being offered tons of JS / CSS includes.'),
+    '#description' => t('While inactive the module is not going to interfere with CSS / JS files, so any existing aggregation may work on its own. This allows the administrator to configure the module. Privileged users will be still able to use the aggregation by visiting the pages with the GET parameter bundle_aggregation to test it out and queue up bundles for generation so when the module is enabled the visitors are not being offered tons of JS / CSS includes. Even if this module is active, bundling will not occur if the site is not configured to !aggregate, or in !maintenance.', array(
+      '!aggregate' => l(t('aggregate CSS and/or JS files'), 'admin/config/development/performance', array('attributes' => array('title' => t('Enable or disable page caching for anonymous users and set CSS and JS bandwidth optimization options.')))), 
+      '!maintenance' => l('maintenance mode', 'admin/config/development/maintenance', array('attributes' => array('title' => t('Take the site offline for maintenance or bring it back online.')))),
+     )),
     '#type' => 'checkbox',
     '#options' => array(
       0 => t('Inactive'),
@@ -20,14 +23,19 @@ function bundle_aggregation_admin_settings() {
     ),
     '#default_value' => (int) variable_get('bundle_aggregation_enabled', FALSE),
   );
-  $form['drupal_css_cache_version'] = array(
+
+  $form['bundle_version'] = array(
+    '#title' => t('Bundle version numbering'),
+    '#type' => 'fieldset',
+  );
+  $form['bundle_version']['drupal_css_cache_version'] = array(
     '#title' => t('CSS bundle version'),
     '#description' => t('This number represents the version of the CSS bundles. Up this number if every CSS bundle needs to be regenerated.'),
     '#type' => 'textfield',
     '#default_value' => variable_get('drupal_css_cache_version', 1),
     '#element_validate' => array('element_validate_integer_positive'),
   );
-  $form['drupal_js_cache_version'] = array(
+  $form['bundle_version']['drupal_js_cache_version'] = array(
     '#title' => t('JS bundle version'),
     '#description' => t('This number represents the version of the JS bundles. Up this number if every JS bundle needs to be regenerated.'),
     '#type' => 'textfield',
@@ -35,16 +43,12 @@ function bundle_aggregation_admin_settings() {
     '#element_validate' => array('element_validate_integer_positive'),
   );
 
-  $form['bundle_aggregation_rebuild_time'] = array(
-    '#title' => t('Bundle processing time'),
-    '#description' => t('Number of seconds a bundle aggregation should finish. This value is used for the queue processing and also for the locking mechanism to avoid bundle generation request flood.'),
-    '#type' => 'textfield',
-    '#default_value' => variable_get('bundle_aggregation_rebuild_time', 60),
-    '#element_validate' => array('element_validate_integer_positive'),
-    '#access' => user_access('administer bundle aggregation technical settings'),
-  );
-  $form['bundle_aggregation_hierarchic_caching'] = array(
+  $form['hierarchic_caching'] = array(
     '#title' => t('Hierarchic caching'),
+    '#type' => 'fieldset',
+  );
+  $form['hierarchic_caching']['bundle_aggregation_hierarchic_caching'] = array(
+    '#title' => t('Hierarchic caching status'),
     '#description' => t('High traffic sites with multiple webheads might have issues with the internal traffic generated by frequently used cache requests. If the hierarchic cache support is enabled bundle changes are being stored in a cache to signal the webheads to refresh the local cache. Assign the cache_bundle_aggregation bin to a local cache instance, assign the cache_bundle_aggregation_locks to a global cache instance.'),
     '#type' => 'checkbox',
     '#options' => array(
@@ -54,7 +58,7 @@ function bundle_aggregation_admin_settings() {
     '#default_value' => variable_get('bundle_aggregation_hierarchic_caching', FALSE),
     '#access' => user_access('administer bundle aggregation technical settings'),
   );
-  $form['bundle_aggregation_hierarchic_cache_ttl'] = array(
+  $form['hierarchic_caching']['bundle_aggregation_hierarchic_cache_ttl'] = array(
     '#title' => t('Hierarchic cache TTL'),
     '#description' => t('When hierarchic caching is enabled the cache items will live for this many seconds, after that they will be refetched from the database.'),
     '#type' => 'textfield',
@@ -62,7 +66,20 @@ function bundle_aggregation_admin_settings() {
     '#element_validate' => array('element_validate_integer_positive'),
     '#access' => user_access('administer bundle aggregation technical settings'),
   );
-  $form['bundle_aggregation_bundle_grace_period'] = array(
+
+  $form['queue_settings'] = array(
+    '#title' => t('Queue settings'),
+    '#type' => 'fieldset',
+  );
+  $form['queue_settings']['bundle_aggregation_rebuild_time'] = array(
+    '#title' => t('Bundle processing time'),
+    '#description' => t('Number of seconds a bundle aggregation should finish. This value is used for the queue processing and also for the locking mechanism to avoid bundle generation request flood.'),
+    '#type' => 'textfield',
+    '#default_value' => variable_get('bundle_aggregation_rebuild_time', 60),
+    '#element_validate' => array('element_validate_integer_positive'),
+    '#access' => user_access('administer bundle aggregation technical settings'),
+  );
+  $form['queue_settings']['bundle_aggregation_bundle_grace_period'] = array(
     '#title' => t('Unused bundle grace period'),
     '#description' => t('Specify the number of seconds after which an unused bundle should be deleted from the server.'),
     '#type' => 'textfield',
@@ -70,7 +87,7 @@ function bundle_aggregation_admin_settings() {
     '#element_validate' => array('element_validate_integer_positive'),
     '#access' => user_access('administer bundle aggregation technical settings'),
   );
-  $form['bundle_aggregation_bundle_cleanup_limit'] = array(
+  $form['queue_settings']['bundle_aggregation_bundle_cleanup_limit'] = array(
     '#title' => t('Bundle cleanup batch size'),
     '#description' => t('Specify the number of bundles to be removed on a cron run.'),
     '#type' => 'textfield',
@@ -201,7 +218,7 @@ function bundle_aggregation_admin_bundle_listing($form, $form_state) {
     $files = unserialize($row->files);
     $rows[] = array(
       'data' => array(
-        l($row->bundle_id, 'admin/config/development/bundle-aggregation/' . $row->bundle_id),
+        l($row->bundle_id, 'admin/config/development/bundle-aggregation/bundles/' . $row->bundle_id),
         strtoupper(bundle_aggregation_pretty_bundle_type($row->bundle_type)),
         $row->path,
         $row->bundle_version,
diff --git a/bundle_aggregation.module b/bundle_aggregation.module
index 754a3b33add1eaaa0c4c102248d89721b4407c84..9f3f5ba31e7dab410757f40a033cc7f4d3266ef9 100644
--- a/bundle_aggregation.module
+++ b/bundle_aggregation.module
@@ -21,25 +21,31 @@ define('BUNDLE_AGGREGATION_JS_BUNDLE', 2);
 function bundle_aggregation_menu() {
   $items = array();
 
-  $items['admin/config/development/bundle-aggregation-settings'] = array(
-    'title' => 'Bundle aggregation settings',
-    'description' => 'Configure settings for CSS/JS bundle generation.',
+  $items['admin/config/development/bundle-aggregation'] = array(
+    'title' => 'Bundle aggregation',
+    'description' => 'Configure and administer aggregated bundles.',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('bundle_aggregation_admin_settings'),
     'access arguments' => array('administer bundle aggregation settings'),
     'file' => 'bundle_aggregation.admin.inc',
   );
-  $items['admin/config/development/bundle-aggregation'] = array(
+  $items['admin/config/development/bundle-aggregation/settings'] = array(
+    'title' => 'Settings',
+    'description' => 'Settings for CSS/JS bundle generation.',
+    'type' => MENU_DEFAULT_LOCAL_TASK,
+  );
+  $items['admin/config/development/bundle-aggregation/bundles'] = array(
     'title' => 'Aggregated bundles',
     'description' => 'View and modify the aggregated bundles.',
     'page callback' => 'bundle_aggregation_admin_bundle_handling',
     'access arguments' => array('administer bundle aggregation'),
     'file' => 'bundle_aggregation.admin.inc',
+    'type' => MENU_LOCAL_TASK,
   );
-  $items['admin/config/development/bundle-aggregation/%bundle_aggregation_bundle'] = array(
+  $items['admin/config/development/bundle-aggregation/bundles/%bundle_aggregation_bundle'] = array(
     'title' => 'Administer bundle',
     'page callback' => 'drupal_get_form',
-    'page arguments' => array('bundle_aggregation_admin_bundle_form', 4),
+    'page arguments' => array('bundle_aggregation_admin_bundle_form', 5),
     'access arguments' => array('administer bundle aggregation'),
     'file' => 'bundle_aggregation.admin.inc',
     'type' => MENU_CALLBACK,
@@ -148,7 +154,7 @@ function bundle_aggregation_css_bundle_key_create($page_id, $css_group) {
  * Create a JS bundle key.
  *
  * Bundles are identified by keys, which are built up from fragments, like
- * page_id, group value, browser dependaency and for what media the bundle is
+ * page_id, group value, browser dependency and for what media the bundle is
  * intended for. The fragments can be disabled on the admin interface to create
  * more generalised bundles.
  *
@@ -589,7 +595,7 @@ function bundle_aggregation_bundle_rebuilding($rebuild_info) {
   }
   else {
     // We have a file list in $bundle_data and we have a file list in the
-    // $rebuild_info['file_list']. Need to comb together these two.
+    // $rebuild_info['file_list']. Need to combine these two.
     foreach ($rebuild_info['file_list'] as $delta => $file_structure) {
       if (!isset($bundle_data['files'][$file_structure['data']])) {
         $bundle_changed = TRUE;