diff --git a/data_ui/data_ui.admin.inc b/data_ui/data_ui.admin.inc
index 88b2540..2737820 100644
--- a/data_ui/data_ui.admin.inc
+++ b/data_ui/data_ui.admin.inc
@@ -163,7 +163,7 @@ function data_ui_adjust_form($form, &$form_state, $table) {
     '#type' => 'fieldset',
     '#title' => t('Comparison'),
   );
-  $form['comparison']['comparison']['#value'] = theme('data_ui_schema_compare_table', array('comparison' => $comparison));
+  $form['comparison']['comparison']['#markup'] = theme('data_ui_schema_compare_table', array('comparison' => $comparison));
 
   if ($comparison['status'] == 'different') {
     $form['update_schema'] = array(
@@ -207,11 +207,11 @@ function data_ui_adjust_form($form, &$form_state, $table) {
       '#value' => t('Create table'),
     );
   }
-  $form['cancel'] = array(
+  $form['cancel_action'] = array(
     '#type' => 'fieldset',
     '#title' => t('Don\'t change anything'),
   );
-  $form['cancel']['cancel'] = array(
+  $form['cancel_action']['cancel'] = array(
     '#type' => 'submit',
     '#value' => t('Cancel'),
   );