Index: tw.module
===================================================================
--- tw.module	(revision 330)
+++ tw.module	(working copy)
@@ -652,12 +652,20 @@
     'access arguments' => array(TW_ACCESS),
     'file' => 'tw_pages.inc',
   );
+  $items['admin/content/tw/tables'] = array(
+    'title' => 'Tables',
+    'description' => 'Manage raw data from arbitrary tables: import, analyze, and view it',
+    'type' => MENU_DEFAULT_LOCAL_TASK,
+    'weight' => 1,
+  );
   $items['admin/content/tw/relationships'] = array(
     'title' => 'Relationships',
     'description' => 'Manage relationships between managed tables',
     'page callback' => 'tw_relationships',
     'access arguments' => array(TW_ACCESS),
     'file' => 'tw_pages.inc',
+    'type' => MENU_LOCAL_TASK,
+    'weight' => 2,
   );
   $items['admin/content/tw/analyze/%'] = array(
     'title' => 'Table analysis',
@@ -667,6 +675,31 @@
     'type' => MENU_CALLBACK,
     'file' => 'tw_pages.inc',
   );
+  $items['admin/content/tw/analyze/%/3'] = array(
+    'title' => 'Non-ignored fields',
+    'access arguments' => array(TW_ACCESS),
+    'type' => MENU_DEFAULT_LOCAL_TASK,
+    'file' => 'tw_pages.inc',
+    'weight' => 1,
+  );
+  $items['admin/content/tw/analyze/%/2'] = array(
+    'title' => 'Ignored fields',
+    'page callback' => 'drupal_get_form',
+    'page arguments' => array('tw_analysis', 4, 5),
+    'access arguments' => array(TW_ACCESS),
+    'type' => MENU_LOCAL_TASK,
+    'file' => 'tw_pages.inc',
+    'weight' => 2,
+  );
+  $items['admin/content/tw/analyze/%/1'] = array(
+    'title' => 'All fields',
+    'page callback' => 'drupal_get_form',
+    'page arguments' => array('tw_analysis', 4, 5),
+    'access arguments' => array(TW_ACCESS),
+    'type' => MENU_LOCAL_TASK,
+    'file' => 'tw_pages.inc',
+    'weight' => 3,
+  );
   $items['admin/content/tw/export'] = array(
     'title' => 'Views definition for hook_views_data()',
     'page callback' => 'tw_export',
Index: tw_pages.inc
===================================================================
--- tw_pages.inc	(revision 316)
+++ tw_pages.inc	(working copy)
@@ -691,18 +691,6 @@
                  array('html' => TRUE));
   }
   $output .= '</div>';
-  $output .= '<div class="tw_analyze_links">';
-  $output .= '<b>Filter: </b>';
-  $output .= l(t('Show all fields'),
-               "admin/content/tw/analyze/$twtid/". TW_COLS_ALL,
-               array('html' => TRUE)) .' | ';
-  $output .= l(t('Show only ignored fields'),
-               "admin/content/tw/analyze/$twtid/". TW_COLS_IGNORE,
-               array('html' => TRUE)) .' | ';
-  $output .= l(t('Show only fields which are not being ignored'),
-               "admin/content/tw/analyze/$twtid/". TW_COLS_NOIGNORE,
-               array('html' => TRUE));
-  $output .= '</div>';
   $output .= '<div>' . drupal_render($form['colcounts']) . '</div>';
 
   $output .= drupal_render($form['provide_view']);