diff --git a/ui/configuration_ui.admin.inc b/ui/configuration_ui.admin.inc
index c3e0a29..4efa1ba 100644
--- a/ui/configuration_ui.admin.inc
+++ b/ui/configuration_ui.admin.inc
@@ -49,7 +49,7 @@ function configuration_ui_tracking_form($form, &$form_state) {
         '#type' => 'fieldset',
         '#group' => 'packages',
         '#title' => check_plain($handler::getComponentHumanName($component)),
-        '#description' => t('Currently tracked configurations for: @component', array('@component' => $handler::getComponentHumanName($component, TRUE))),
+        '#description' => '<span class= "component" rel="' . check_plain($component) . '">' .  t('Currently tracked configurations for: @component', array('@component' => $handler::getComponentHumanName($component, TRUE))) . '</span>',
         '#collapsible' => TRUE,
         '#collapsed' => TRUE,
         '#tree' => TRUE,
@@ -226,21 +226,21 @@ function configuration_ui_config_info($config_id) {
 
   $status = check_plain($config->getStatus());
   if ($diff_exists && $status != t('In Sync')) {
-    $status = l(check_plain($status), 'admin/config/configuration/diff/' . arg(4), array('attributes' => array('title' => t('View differences'))));
+    $status = l(check_plain($status), 'admin/config/system/configuration/diff/' . arg(5), array('attributes' => array('title' => t('View differences'))));
   }
-  if (arg(5) == 'status') {
+  if (arg(6) == 'status') {
     print $status;
     exit();
   }
-  if (arg(5) == 'dependencies') {
+  if (arg(6) == 'dependencies') {
     ConfigurationManagement::rawDepdendencyInfo(array($config_id), TRUE, FALSE);
     exit();
   }
-  if (arg(5) == 'optionals') {
+  if (arg(6) == 'optionals') {
     ConfigurationManagement::rawDepdendencyInfo(array($config_id), FALSE, TRUE);
     exit();
   }
-  if (arg(5) == 'dependencies_optionals') {
+  if (arg(6) == 'dependencies_optionals') {
     ConfigurationManagement::rawDepdendencyInfo(array($config_id), TRUE, TRUE);
     exit();
   }
@@ -275,6 +275,60 @@ function configuration_ui_config_info($config_id) {
 }
 
 /**
+ * Menu Callback: Return the status for each tracked configuration.
+ */
+function configuration_ui_config_status($component) {
+  $components = ConfigurationManagement::getConfigurationHandler();
+  if (empty($components[$component])) {
+    print '';
+    exit();
+  }
+
+  $tracked_in_file = ConfigurationManagement::readTrackingFile();
+
+  $tracked = ConfigurationManagement::trackedConfigurations();
+  $status = array();
+  $needs_attention = 0;
+  foreach ($tracked as $component_id => $info) {
+    if ($component_id == $component) {
+      foreach ($info as $identifier => $item) {
+        $id = $component . '.' . $identifier;
+        $config = ConfigurationManagement::createConfigurationInstance($id);
+        $hash = $config->loadFromActiveStore()->getHash();
+        if ($config->isBroken()) {
+          $status[$id] = t('Removed from Active Store');
+        }
+        elseif (empty($tracked_in_file['tracked'][$id])) {
+          $status[$id] = t('Active Store Only');
+        }
+        elseif ($hash != $item['hash']) {
+          $status[$id] = t('Overriden');
+        }
+        else {
+          $status[$id] = t('In Sync');
+        }
+
+        if ($status[$id] != t('In Sync')) {
+          $needs_attention++;
+        }
+
+        unset($config);
+      }
+      break;
+    }
+  }
+
+  $return = array(
+    'status' => $status,
+    'diff' => module_exists('diff'),
+    'needs_attention' => $needs_attention,
+  );
+
+  print drupal_json_encode($return);
+  exit();
+}
+
+/**
  * Menu Callback Form.
  */
 function configuration_ui_config_diff($config_id) {
diff --git a/ui/configuration_ui.module b/ui/configuration_ui.module
index 538df2f..7cd8807 100644
--- a/ui/configuration_ui.module
+++ b/ui/configuration_ui.module
@@ -77,19 +77,28 @@ function configuration_ui_menu() {
     'type' => MENU_CALLBACK,
   );
 
-  $items['admin/config/configuration/view/%'] = array(
+  $items['admin/config/system/configuration/view/%'] = array(
     'title' => 'Configuration Management',
     'page callback' => 'configuration_ui_config_info',
-    'page arguments' => array(4),
+    'page arguments' => array(5),
     'file' => 'configuration_ui.admin.inc',
     'access arguments' => array('administer configuration management'),
   );
 
+  $items['admin/config/system/configuration/status/%'] = array(
+    'title' => 'Configuration Management',
+    'page callback' => 'configuration_ui_config_status',
+    'page arguments' => array(5),
+    'file' => 'configuration_ui.admin.inc',
+    'access arguments' => array('administer configuration management'),
+    'type' => MENU_CALLBACK,
+  );
+
   if (module_exists('diff')) {
-    $items['admin/config/configuration/diff/%'] = array(
+    $items['admin/config/system/configuration/diff/%'] = array(
       'title' => 'Configuration Management',
       'page callback' => 'configuration_ui_config_diff',
-      'page arguments' => array(4),
+      'page arguments' => array(5),
       'file' => 'configuration_ui.admin.inc',
       'access arguments' => array('administer configuration management'),
     );
diff --git a/ui/js/configuration_ui.js b/ui/js/configuration_ui.js
index 9bb30ba..7b9921b 100644
--- a/ui/js/configuration_ui.js
+++ b/ui/js/configuration_ui.js
@@ -1,15 +1,39 @@
 (function ($) {
   Drupal.behaviors.configuration_ui = {
     attach: function(context, settings) {
+
+      var components = $("#configuration-ui-tracking-form span.component:not(.processed)").length;
+
       // Configuration management form
-      $('#configuration-ui-tracking-form span.config-status:not(.processed)').each(function() {
+      var in_sync = Drupal.t('In Sync');
+      $('#configuration-ui-tracking-form span.component:not(.processed)').each(function() {
         $(this).addClass('processed');
+        var component = $(this).attr('rel');
+
+        $.getJSON(Drupal.settings.basePath + 'admin/config/system/configuration/status/' + component, function(data) {
+          var items = [];
+
+          $.each(data['status'], function(key, val) {
+            var span = $("span[rel=" + key + "]")
+
+            span.addClass('processed').html(val);
+            if (val != in_sync) {
+              span.addClass('not_in_sync');
+            }
+            if (data['diff']) {
+              span.addClass('processed').html('<a href ="' + Drupal.settings.basePath + 'admin/config/system/configuration/diff/' + key + '">' + val + '</a>');
+            }
+          });
+
+          if (!--components) {
+            $('#configuration-ui-tracking-form').addClass('status-check-completed');
+            updateCheckedCount(context);
+          }
 
-        // Check the overridden status of each configuration
-        var id = $(this).attr('rel');
-        $(this).load(Drupal.settings.basePath + 'admin/config/configuration/view/' + id + '/status', updateCheckedCount);
+        });
       });
-      $('#configuration-ui-tracking-form').addClass('status-check-completed');
+
+
 
       $("fieldset.configuration .form-checkbox").bind('click', function() {
         var current_checkbox = $(this);
@@ -25,7 +49,7 @@
           }
           var original_value = current_checkbox.parents('td').next().html();
           current_checkbox.parents('td').next().html(original_value + ' ' + Drupal.t('(Finding dependencies...)'));
-          $.getJSON(Drupal.settings.basePath + 'admin/config/configuration/view/' + $(this).val() + '/' + url, function(data) {
+          $.getJSON(Drupal.settings.basePath + 'admin/config/system/configuration/view/' + $(this).val() + '/' + url, function(data) {
 
             $.each(data, function(index, array) {
               if (current_checkbox.is(':checked')) {
@@ -52,19 +76,12 @@
 
   function updateCheckedCount(context) {
     var needs_attention = 0;
-    var in_sync = Drupal.t('In Sync');
-    var processing = Drupal.t('Processing...');
     $("fieldset.configuration").each(function(){
       var id = '#' + this.id;
       $(this, context).drupalSetSummary(function (context) {
         var count = $(id + ' table .form-item :input[type="checkbox"]:checked').length;
 
-        needs_attention = 0;
-        $('.status-check-completed #' + id + ' table span.processed').each(function(){
-          if (this.innerHTML != in_sync && this.innerHTML != processing) {
-            needs_attention++;
-          }
-        });
+        needs_attention = $(id + ' span.not_in_sync').length;
 
         if (needs_attention > 0) {
           return Drupal.t('@count selected <strong>(@attention needs attention)</strong>', {'@count': count, '@attention': needs_attention});
@@ -76,4 +93,6 @@
     });
   }
 
+
+
 })(jQuery);