diff --git a/entity_uuid.admin.inc b/entity_uuid.admin.inc
index c54cb1a..36b34fd 100644
--- a/entity_uuid.admin.inc
+++ b/entity_uuid.admin.inc
@@ -10,30 +10,20 @@
  */
 function entity_uuid_settings_form($form, &$form_state) {
   $setting = variable_get('entity_uuid', array());
-
   $form['entity_uuid'] = array(
-    '#type' => 'table',
-    '#table_name' => 'entity_uuid',
-    '#empty' => t('There are no elements.'),
-    '#header' => array(
-      'entity_type' => t('Entity type'),
-      'uuid' => t('Use UUID'),
-    ),
-    '#select' => FALSE,
+    '#tree' => TRUE,
   );
 
   $info = entity_get_info();
   foreach ($info as $entity_type => $value) {
     // Set default value and disabled for checkbox.
     $disabled = isset($value['uuid']) ? $value['uuid'] : FALSE;
-    $default_value = isset($setting[$entity_type]['uuid']) ? ($setting[$entity_type]['uuid'] || $disabled) : $disabled;
+    $default_value = isset($setting[$entity_type]) ? ($setting[$entity_type] || $disabled) : $disabled;
 
-    $form['entity_uuid'][$entity_type]['entity_type'] = array(
-      '#markup' => $value['label'],
-    );
-    $form['entity_uuid'][$entity_type]['uuid'] = array(
+    $form['entity_uuid'][$entity_type] = array(
       '#type' => 'checkbox',
       '#disabled' => $disabled,
+      '#title' => $value['label'],
       '#default_value' => $default_value,
     );
   }
@@ -50,6 +40,7 @@ function entity_uuid_settings_form($form, &$form_state) {
 function entity_uuid_apply_config($form, &$form_state) {
   // Rebuild entity_info cache.
   entity_info_cache_clear();
+  entity_get_info();
   // Makes sure that the schema for all entity types, which set in config is
   // set correct.
   entity_uuid_install_uuid_fields();
diff --git a/entity_uuid.module b/entity_uuid.module
index 76b7fa3..e9f5587 100644
--- a/entity_uuid.module
+++ b/entity_uuid.module
@@ -60,11 +60,13 @@ function entity_uuid_get_entity_info() {
  */
 function entity_uuid_entity_info_alter(&$info) {
   $setting = variable_get('entity_uuid', array());
+
   if (empty($setting)) {
     return;
   }
+
   foreach ($setting as $entity_type => $uuid) {
-    if ($uuid['uuid']) {
+    if ($uuid) {
       $info[$entity_type]['entity keys']['uuid'] = 'uuid';
       $info[$entity_type]['uuid'] = TRUE;
       if (isset($info[$entity_type]['revision table']) && isset($info[$entity_type]['entity keys']['revision'])) {