--- stormexpense/stormexpense.views.inc	Mon Jan 19 17:26:36 1970
+++ stormexpense/stormexpense.views.inc	Mon Jan 19 17:26:36 1970
@@ -2,7 +2,7 @@
 // $Id: stormexpense.views.inc,v 1.1.2.3 2009/12/12 21:38:38 magnity Exp $
 
 function stormexpense_views_data() {
-  $data['stormexpense']['table']['group']  = 'Storm';
+  $data['stormexpense']['table']['group']  = t('Storm Expense');
   $data['stormexpense']['table']['join'] = array(
     'node' => array(
       'left_field' => 'vid',
@@ -11,25 +11,19 @@
   );
 
   $data['stormexpense']['organization_nid'] = array(
-    'title' => t('Expense Organization Node ID'),
-    'help' => t('Storm Expense Organization Node ID'),
-    'field' => array(
-      'click sortable' => TRUE,
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort',
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric',
-    ),
-    'argument' => array(
-      'handler' => 'views_handler_argument_numeric',
+    'title' => t('Organization'),
+    'help' => t('Expense -> Organization'),
+    'relationship' => array(
+      'base' => 'node',
+      'field' => 'nid',
+      'handler' => 'views_handler_relationship',
+      'label' => t('Expense -> Organization'),
     ),
   );
   
   $data['stormexpense']['organization_title'] = array(
-    'title' => t('Expense Organization'),
-    'help' => t('Storm Expense Organization'),
+    'title' => t('Organization'),
+    'help' => t('Storm Expense: Organization (title only)'),
     'field' => array(
       'click sortable' => TRUE,
     ),
@@ -45,25 +39,19 @@
   );
   
   $data['stormexpense']['project_nid'] = array(
-    'title' => t('Expense Project Node ID'),
-    'help' => t('Storm Expense Project Node ID'),
-    'field' => array(
-      'click sortable' => TRUE,
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort',
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric',
-    ),
-    'argument' => array(
-      'handler' => 'views_handler_argument_numeric',
+    'title' => t('Project'),
+    'help' => t('Expense -> Project'),
+    'relationship' => array(
+      'base' => 'node',
+      'field' => 'nid',
+      'handler' => 'views_handler_relationship',
+      'label' => t('Expense -> Project'),
     ),
   );
 
   $data['stormexpense']['project_title'] = array(
-    'title' => t('Expense Project'),
-    'help' => t('Storm Expense Project'),
+    'title' => t('Project'),
+    'help' => t('Storm Expense Project (title only)'),
     'field' => array(
       'click sortable' => TRUE,
     ),
@@ -79,24 +67,18 @@
   );
 
   $data['stormexpense']['task_nid'] = array(
-    'title' => t('Expense Task Node ID'),
-    'help' => t('Storm Expense Task Node ID'),
-    'field' => array(
-      'click sortable' => TRUE,
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort',
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric',
-    ),
-    'argument' => array(
-      'handler' => 'views_handler_argument_numeric',
+    'title' => t('Task'),
+    'help' => t('Expense -> Task'),
+    'relationship' => array(
+      'base' => 'node',
+      'field' => 'nid',
+      'handler' => 'views_handler_relationship',
+      'label' => t('Expense -> Task'),
     ),
   );
 
   $data['stormexpense']['task_stepno'] = array(
-    'title' => t('Expense Task Step Number'),
+    'title' => t('Task Step Number'),
     'help' => t('Storm Expense Task Step Number'),
     'field' => array(
       'click sortable' => TRUE,
@@ -113,8 +95,8 @@
   );
   
   $data['stormexpense']['task_title'] = array(
-    'title' => t('Expense Task'),
-    'help' => t('Storm Expense Task'),
+    'title' => t('Task'),
+    'help' => t('Storm Expense Task (title only)'),
     'field' => array(
       'click sortable' => TRUE,
     ),
@@ -131,25 +113,19 @@
 
   
   $data['stormexpense']['ticket_nid'] = array(
-    'title' => t('Expense Ticket Node ID'),
-    'help' => t('Storm Expense Ticket Node ID'),
-    'field' => array(
-      'click sortable' => TRUE,
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort',
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric',
-    ),
-    'argument' => array(
-      'handler' => 'views_handler_argument_numeric',
+    'title' => t('Ticket'),
+    'help' => t('Expense -> Ticket'),
+    'relationship' => array(
+      'base' => 'node',
+      'field' => 'nid',
+      'handler' => 'views_handler_relationship',
+      'label' => t('Expense -> Ticket'),
     ),
   );
 
   $data['stormexpense']['ticket_title'] = array(
-    'title' => t('Expense Ticket'),
-    'help' => t('Storm Expense Ticket'),
+    'title' => t('Ticket'),
+    'help' => t('Storm Expense Ticket (title only)'),
     'field' => array(
       'click sortable' => TRUE,
     ),
@@ -165,25 +141,19 @@
   );
   
   $data['stormexpense']['provider_nid'] = array(
-    'title' => t('Expense Provider Node ID'),
-    'help' => t('Storm Expense Provider Node ID'),
-    'field' => array(
-      'click sortable' => TRUE,
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort',
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric',
-    ),
-    'argument' => array(
-      'handler' => 'views_handler_argument_numeric',
+    'title' => t('Provider'),
+    'help' => t('Expense -> Provider'),
+    'relationship' => array(
+      'base' => 'node',
+      'field' => 'nid',
+      'handler' => 'views_handler_relationship',
+      'label' => t('Expense -> Provider'),
     ),
   );
 
   $data['stormexpense']['provider_title'] = array(
-    'title' => t('Expense Provider'),
-    'help' => t('Storm Expense Provider'),
+    'title' => t('Provider'),
+    'help' => t('Storm Expense Provider (title only)'),
     'field' => array(
       'click sortable' => TRUE,
     ),
@@ -199,7 +169,7 @@
   );
   
   $data['stormexpense']['expensedate'] = array(
-    'title' => t('Expense Date'),
+    'title' => t('Date'),
     'help' => t('Storm Expense Date'),
     'field' => array(
       'click sortable' => TRUE,
@@ -214,8 +184,8 @@
   );
   
   $data['stormexpense']['amount'] = array(
-    'title' => t('Expense Amount'),
-    'help' => 'Storm Expense Amount',
+    'title' => t('Amount'),
+    'help' => t('Storm Expense Amount'),
     'field' => array(
       'click sortable' => TRUE,
     ),
@@ -231,8 +201,8 @@
   );
   
   $data['stormexpense']['tax'] = array(
-    'title' => t('Expense Tax'),
-    'help' => 'Storm Expense Tax',
+    'title' => t('Tax'),
+    'help' => t('Storm Expense Tax'),
     'field' => array(
       'click sortable' => TRUE,
     ),
@@ -248,8 +218,8 @@
   );
   
   $data['stormexpense']['total'] = array(
-    'title' => t('Expense Total'),
-    'help' => 'Storm Expense Total',
+    'title' => t('Total'),
+    'help' => t('Storm Expense Total'),
     'field' => array(
       'click sortable' => TRUE,
     ),
--- storminvoice/storminvoice.views.inc	Mon Jan 19 17:26:36 1970
+++ storminvoice/storminvoice.views.inc	Mon Jan 19 17:26:36 1970
@@ -3,7 +3,7 @@
 
 function storminvoice_views_data() {
   // Invoice core fields
-  $data['storminvoice']['table']['group']  = 'Storm';
+  $data['storminvoice']['table']['group']  = t('Storm Invoice');
   $data['storminvoice']['table']['join'] = array(
     'node' => array(
       'left_field' => 'vid',
@@ -12,8 +12,8 @@
   );
   
   $data['storminvoice']['number'] = array(
-    'title' => t('Invoice Number'),
-    'help' => 'Storm Invoice Number',
+    'title' => t('Number'),
+    'help' => t('Storm Invoice Number'),
     'field' => array(
       'click sortable' => TRUE,
     ),
@@ -29,8 +29,8 @@
   );
 
   $data['storminvoice']['reference'] = array(
-    'title' => t('Invoice Reference'),
-    'help' => 'Storm Invoice Reference',
+    'title' => t('Reference'),
+    'help' => t('Storm Invoice Reference'),
     'field' => array(
       'click sortable' => TRUE,
     ),
@@ -46,25 +46,19 @@
   );
   
   $data['storminvoice']['organization_nid'] = array(
-    'title' => t('Invoice Organization Node ID'),
-    'help' => t('Storm Invoice organization Node ID'),
-    'field' => array(
-      'click sortable' => TRUE,
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort',
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric',
-    ),
-    'argument' => array(
-      'handler' => 'views_handler_argument_numeric',
+    'title' => t('Organization'),
+    'help' => t('Invoice -> Organization'),
+    'relationship' => array(
+      'base' => 'node',
+      'field' => 'nid',
+      'handler' => 'views_handler_relationship',
+      'label' => t('Invoice -> Organization'),
     ),
   );
   
   $data['storminvoice']['organization_title'] = array(
-    'title' => t('Invoice Organization'),
-    'help' => t('Storm Invoice organization'),
+    'title' => t('Organization'),
+    'help' => t('Storm Invoice Organization (title only)'),
     'field' => array(
       'click sortable' => TRUE,
     ),
@@ -80,25 +74,19 @@
   );
 
   $data['storminvoice']['project_nid'] = array(
-    'title' => t('Invoice Project Node ID'),
-    'help' => t('Storm Invoice Project Node ID'),
-    'field' => array(
-      'click sortable' => TRUE,
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort',
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric',
-    ),
-    'argument' => array(
-      'handler' => 'views_handler_argument_numeric',
+    'title' => t('Project'),
+    'help' => t('Invoice -> Project'),
+    'relationship' => array(
+      'base' => 'node',
+      'field' => 'nid',
+      'handler' => 'views_handler_relationship',
+      'label' => t('Invoice -> Project'),
     ),
   );
   
   $data['storminvoice']['project_title'] = array(
-    'title' => t('Invoice Project'),
-    'help' => t('Storm Invoice project'),
+    'title' => t('Project'),
+    'help' => t('Storm Invoice Project (title only)'),
     'field' => array(
       'click sortable' => TRUE,
     ),
@@ -114,7 +102,7 @@
   );
 
   $data['storminvoice']['requestdate'] = array(
-    'title' => t('Invoice Request Date'),
+    'title' => t('Request Date'),
     'help' => t('Storm Invoice Request Date'),
     'field' => array(
       'click sortable' => TRUE,
@@ -129,7 +117,7 @@
   );
   
   $data['storminvoice']['duedate'] = array(
-    'title' => t('Invoice Due Date'),
+    'title' => t('Due Date'),
     'help' => t('Storm Invoice Due Date'),
     'field' => array(
       'click sortable' => TRUE,
@@ -144,7 +132,7 @@
   );
 
   $data['storminvoice']['paymentdate'] = array(
-    'title' => t('Invoice Payment Date'),
+    'title' => t('Payment Date'),
     'help' => t('Storm Invoice Payment Date'),
     'field' => array(
       'click sortable' => TRUE,
@@ -159,8 +147,8 @@
   );
   
   $data['storminvoice']['amount'] = array(
-    'title' => t('Invoice Amount'),
-    'help' => 'Storm Invoice Amount',
+    'title' => t('Amount'),
+    'help' => t('Storm Invoice Amount'),
     'field' => array(
       'click sortable' => TRUE,
     ),
@@ -176,8 +164,8 @@
   );
   
   $data['storminvoice']['tax1'] = array(
-    'title' => t('Invoice Tax1'),
-    'help' => 'Storm Invoice Tax 1',
+    'title' => t('Tax 1'),
+    'help' => t('Storm Invoice Tax 1'),
     'field' => array(
       'click sortable' => TRUE,
     ),
@@ -193,8 +181,8 @@
   );
 
   $data['storminvoice']['tax2'] = array(
-    'title' => t('Invoice Tax2'),
-    'help' => 'Storm Invoice Tax 2',
+    'title' => t('Tax 2'),
+    'help' => t('Storm Invoice Tax 2'),
     'field' => array(
       'click sortable' => TRUE,
     ),
@@ -210,8 +198,8 @@
   );
   
   $data['storminvoice']['total'] = array(
-    'title' => t('Invoice Total'),
-    'help' => 'Storm Invoice Total',
+    'title' => t('Total'),
+    'help' => t('Storm Invoice Total'),
     'field' => array(
       'click sortable' => TRUE,
     ),
@@ -227,8 +215,8 @@
   );
   
   $data['storminvoice']['totalcustomercurr'] = array(
-    'title' => t('Invoice Total in Customer Currency'),
-    'help' => 'Storm Invoice Total in Customer Currency',
+    'title' => t('Total in Customer Currency'),
+    'help' => t('Storm Invoice Total in Customer Currency'),
     'field' => array(
       'click sortable' => TRUE,
     ),
@@ -244,8 +232,8 @@
   );
   
   $data['storminvoice']['taxexempt'] = array(
-    'title' => t('Invoice Tax Exempt'),
-    'help' => 'Storm Invoice Tax Exempt',
+    'title' => t('Tax Exempt'),
+    'help' => t('Storm Invoice Tax Exempt'),
     'field' => array(
       'click sortable' => TRUE,
     ),
@@ -261,7 +249,7 @@
   );
 
   // Invoice items
-  $data['storminvoice_items']['table']['group']  = 'Storm';
+  $data['storminvoice_items']['table']['group']  = t('Storm Invoice Item');
   $data['storminvoice_items']['table']['join'] = array(
     'node' => array(
       'left_field' => 'nid',
@@ -270,25 +258,19 @@
   );
   
   $data['storminvoice_items']['invoice_nid'] = array(
-    'title' => t('Invoiceitem Invoice Node ID'),
-    'help' => 'Storm Invoiceitem Invoice Node ID',
-    'field' => array(
-      'click sortable' => TRUE,
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort',
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric',
-    ),
-    'argument' => array(
-      'handler' => 'views_handler_argument_numeric',
+    'title' => t('Invoice'),
+    'help' => t('Invoiceitem -> Invoice'),
+    'relationship' => array(
+      'base' => 'node',
+      'field' => 'nid',
+      'handler' => 'views_handler_relationship',
+      'label' => t('Invoiceitem -> Invoice'),
     ),
   );
 
   $data['storminvoice_items']['weight'] = array(
-    'title' => t('Invoiceitem Weight'),
-    'help' => 'Storm Invoiceitem Weight',
+    'title' => t('Weight'),
+    'help' => t('Storm Invoiceitem Weight'),
     'field' => array(
       'click sortable' => TRUE,
     ),
@@ -304,7 +286,7 @@
   );
   
   $data['storminvoice_items']['amount'] = array(
-    'title' => t('Invoiceitem Amount'),
+    'title' => t('Amount'),
     'help' => t('Storm Invoiceitem Amount'),
     'field' => array(
       'click sortable' => TRUE,
@@ -321,7 +303,7 @@
   );
   
   $data['storminvoice_items']['tax1percent'] = array(
-    'title' => t('Invoiceitem Tax 1 Percent'),
+    'title' => t('Tax 1 Percent'),
     'help' => t('Storm Invoiceitem Tax 1 Percent'),
     'field' => array(
       'click sortable' => TRUE,
@@ -338,7 +320,7 @@
   );
 
   $data['storminvoice_items']['tax2percent'] = array(
-    'title' => t('Invoiceitem Tax 2 Percent'),
+    'title' => t('Tax 2 Percent'),
     'help' => t('Storm Invoiceitem Tax 2 Percent'),
     'field' => array(
       'click sortable' => TRUE,
@@ -355,7 +337,7 @@
   );
 
   $data['storminvoice_items']['tax1'] = array(
-    'title' => t('Invoiceitem Tax 1'),
+    'title' => t('Tax 1'),
     'help' => t('Storm Invoiceitem Tax 1'),
     'field' => array(
       'click sortable' => TRUE,
@@ -372,7 +354,7 @@
   );
 
   $data['storminvoice_items']['tax2'] = array(
-    'title' => t('Invoiceitem Tax 2'),
+    'title' => t('Tax 2'),
     'help' => t('Storm Invoiceitem Tax 2'),
     'field' => array(
       'click sortable' => TRUE,
@@ -389,7 +371,7 @@
   );
   
   $data['storminvoice_items']['total'] = array(
-    'title' => t('Invoiceitem Total'),
+    'title' => t('Total'),
     'help' => t('Storm Invoiceitem Total'),
     'field' => array(
       'click sortable' => TRUE,
--- stormnote/stormnote.views.inc	Mon Jan 19 17:26:36 1970
+++ stormnote/stormnote.views.inc	Mon Jan 19 17:26:36 1970
@@ -2,7 +2,7 @@
 // $Id: stormnote.views.inc,v 1.1.2.4 2009/12/12 21:38:38 magnity Exp $
 
 function stormnote_views_data() {
-  $data['stormnote']['table']['group']  = 'Storm';
+  $data['stormnote']['table']['group']  = t('Storm Note');
   $data['stormnote']['table']['join'] = array(
     'node' => array(
       'left_field' => 'vid',
@@ -11,25 +11,19 @@
   );
   
   $data['stormnote']['organization_nid'] = array(
-    'title' => t('Note Organization Node ID'),
-    'help' => 'Storm Note Organization Node ID',
-    'field' => array(
-      'click sortable' => TRUE,
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort',
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric',
-    ),
-    'argument' => array(
-      'handler' => 'views_handler_argument_numeric',
+    'title' => t('Organization'),
+    'help' => t('Note -> Organization'),
+    'relationship' => array(
+      'base' => 'node',
+      'field' => 'nid',
+      'handler' => 'views_handler_relationship',
+      'label' => t('Note -> Organization'),
     ),
   );
   
   $data['stormnote']['organization_title'] = array(
-    'title' => t('Note Organization Title'),
-    'help' => 'Storm Note Organization Title',
+    'title' => t('Organization'),
+    'help' => t('Storm Note Organization (title only)'),
     'field' => array(
       'click sortable' => TRUE,
     ),
@@ -45,25 +39,19 @@
   );
   
   $data['stormnote']['project_nid'] = array(
-    'title' => t('Note Project Node ID'),
-    'help' => 'Storm Note Project Node ID',
-    'field' => array(
-      'click sortable' => TRUE,
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort',
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric',
-    ),
-    'argument' => array(
-      'handler' => 'views_handler_argument_numeric',
+    'title' => t('Project'),
+    'help' => t('Note -> Project'),
+    'relationship' => array(
+      'base' => 'node',
+      'field' => 'nid',
+      'handler' => 'views_handler_relationship',
+      'label' => t('Note -> Project'),
     ),
   );
   
   $data['stormnote']['project_title'] = array(
-    'title' => t('Note Project Title'),
-    'help' => 'Storm Note Project Title',
+    'title' => t('Project'),
+    'help' => t('Storm Note Project (title only)'),
     'field' => array(
       'click sortable' => TRUE,
     ),
@@ -79,25 +67,19 @@
   );
   
   $data['stormnote']['task_nid'] = array(
-    'title' => t('Note Task Node ID'),
-    'help' => 'Storm Note Task Node ID',
-    'field' => array(
-      'click sortable' => TRUE,
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort',
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric',
-    ),
-    'argument' => array(
-      'handler' => 'views_handler_argument_numeric',
+    'title' => t('Task'),
+    'help' => t('Note -> Task'),
+    'relationship' => array(
+      'base' => 'node',
+      'field' => 'nid',
+      'handler' => 'views_handler_relationship',
+      'label' => t('Note -> Task'),
     ),
   );
   
   $data['stormnote']['task_stepno'] = array(
-    'title' => t('Note Task Step Number'),
-    'help' => 'Storm Note Task Step Number',
+    'title' => t('Task Step Number'),
+    'help' => t('Storm Note Task Step Number'),
     'field' => array(
       'click sortable' => TRUE,
     ),
@@ -113,8 +95,8 @@
   );
   
   $data['stormnote']['task_title'] = array(
-    'title' => t('Note Task Title'),
-    'help' => 'Storm Note Task Title',
+    'title' => t('Task'),
+    'help' => t('Storm Note Task (title only)'),
     'field' => array(
       'click sortable' => TRUE,
     ),
--- stormorganization/stormorganization.views.inc	Mon Jan 19 17:26:36 1970
+++ stormorganization/stormorganization.views.inc	Mon Jan 19 17:26:36 1970
@@ -2,7 +2,7 @@
 // $Id: stormorganization.views.inc,v 1.1.4.7 2009/12/12 21:38:39 magnity Exp $
 
 function stormorganization_views_data() {
-  $data['stormorganization']['table']['group']  = 'Storm';
+  $data['stormorganization']['table']['group']  = 'Storm Organization';
   $data['stormorganization']['table']['join'] = array(
     'node' => array(
       'left_field' => 'vid',
@@ -11,8 +11,8 @@
   );
   
   $data['stormorganization']['prefix'] = array(
-    'title' => t('Organisation Prefix'),
-    'help' => 'Storm Organization Prefix',
+    'title' => t('Prefix'),
+    'help' => t('Storm Organization Prefix'),
     'field' => array(
       'click sortable' => TRUE,
     ),
@@ -28,8 +28,8 @@
   );
   
   $data['stormorganization']['fullname'] = array(
-    'title' => t('Organisation Fullname'),
-    'help' => 'Storm Organization Fullname',
+    'title' => t('Fullname'),
+    'help' => t('Storm Organization Fullname'),
     'field' => array(
       'click sortable' => TRUE,
     ),
@@ -45,8 +45,8 @@
   );
   
   $data['stormorganization']['country'] = array(
-    'title' => t('Organisation Country'),
-    'help' => 'Storm Organization Country',
+    'title' => t('Country'),
+    'help' => t('Storm Organization Country'),
     'field' => array(
       'click sortable' => TRUE,
     ),
@@ -62,8 +62,8 @@
   );
   
   $data['stormorganization']['orglanguage'] = array(
-    'title' => t('Organisation Language'),
-    'help' => 'Storm Organization Language',
+    'title' => t('Language'),
+    'help' => t('Storm Organization Language'),
     'field' => array(
       'click sortable' => TRUE,
     ),
@@ -79,8 +79,8 @@
   );
   
   $data['stormorganization']['provstate'] = array(
-    'title' => t('Organisation Province / State'),
-    'help' => 'Storm Organization Province / State',
+    'title' => t('Province / State'),
+    'help' => t('Storm Organization Province / State'),
     'field' => array(
       'click sortable' => TRUE,
     ),
@@ -96,8 +96,8 @@
   );
   
   $data['stormorganization']['city'] = array(
-    'title' => t('Organisation City'),
-    'help' => 'Storm Organization City',
+    'title' => t('City'),
+    'help' => t('Storm Organization City'),
     'field' => array(
       'click sortable' => TRUE,
     ),
@@ -113,8 +113,8 @@
   );
   
   $data['stormorganization']['zip'] = array(
-    'title' => t('Organisation Zip'),
-    'help' => 'Storm Organization Zip',
+    'title' => t('Zip'),
+    'help' => t('Storm Organization Zip'),
     'field' => array(
       'click sortable' => TRUE,
     ),
@@ -130,8 +130,8 @@
   );
   
   $data['stormorganization']['address'] = array(
-    'title' => t('Organisation Address'),
-    'help' => 'Storm Organization Address',
+    'title' => t('Address'),
+    'help' => t('Storm Organization Address'),
     'field' => array(
       'click sortable' => TRUE,
     ),
@@ -147,8 +147,8 @@
   );
   
   $data['stormorganization']['taxid'] = array(
-    'title' => t('Organisation Tax ID'),
-    'help' => 'Storm Organization Tax ID',
+    'title' => t('Tax ID'),
+    'help' => t('Storm Organization Tax ID'),
     'field' => array(
       'click sortable' => TRUE,
     ),
@@ -164,8 +164,8 @@
   );
   
   $data['stormorganization']['email'] = array(
-    'title' => t('Organisation Email'),
-    'help' => 'Storm Organization Email',
+    'title' => t('Email'),
+    'help' => t('Storm Organization Email'),
     'field' => array(
       'click sortable' => TRUE,
     ),
@@ -181,8 +181,8 @@
   );
   
   $data['stormorganization']['www'] = array(
-    'title' => t('Organisation WWW'),
-    'help' => 'Storm Organization WWW',
+    'title' => t('WWW'),
+    'help' => t('Storm Organization WWW'),
     'field' => array(
       'click sortable' => TRUE,
     ),
@@ -198,8 +198,8 @@
   );
   
   $data['stormorganization']['phone'] = array(
-    'title' => t('Organisation Phone'),
-    'help' => 'Storm Organization Phone',
+    'title' => t('Phone'),
+    'help' => t('Storm Organization Phone'),
     'field' => array(
       'click sortable' => TRUE,
     ),
@@ -215,8 +215,8 @@
   );
   
   $data['stormorganization']['currency'] = array(
-    'title' => t('Organisation Currency'),
-    'help' => 'Storm Organization Currency',
+    'title' => t('Currency'),
+    'help' => t('Storm Organization Currency'),
     'field' => array(
       'handler' => 'stormattribute_handler_field_attributes_domain',
       'domain' => 'Currency',
@@ -235,8 +235,8 @@
   );
   
   $data['stormorganization']['iscustomer'] = array(
-    'title' => t('Organisation Is Customer'),
-    'help' => 'Storm Organization Is Customer',
+    'title' => t('Is Customer'),
+    'help' => t('Storm Organization Is Customer'),
     'field' => array(
       'click sortable' => TRUE,
     ),
@@ -252,8 +252,8 @@
   );
   
   $data['stormorganization']['isprovider'] = array(
-    'title' => t('Organisation Is Provider'),
-    'help' => 'Storm Organization Is Provider',
+    'title' => t('Is Provider'),
+    'help' => t('Storm Organization Is Provider'),
     'field' => array(
       'click sortable' => TRUE,
     ),
@@ -269,8 +269,8 @@
   );
   
   $data['stormorganization']['isactive'] = array(
-    'title' => t('Organisation Is Active'),
-    'help' => 'Storm Organization Is Active',
+    'title' => t('Is Active'),
+    'help' => t('Storm Organization Is Active'),
     'field' => array(
       'click sortable' => TRUE,
     ),
--- stormperson/stormperson.views.inc	Mon Jan 19 17:26:36 1970
+++ stormperson/stormperson.views.inc	Mon Jan 19 17:26:36 1970
@@ -2,7 +2,7 @@
 // $Id: stormperson.views.inc,v 1.1.2.3 2009/12/12 21:38:39 magnity Exp $
 
 function stormperson_views_data() {
-  $data['stormperson']['table']['group']  = 'Storm';
+  $data['stormperson']['table']['group']  = 'Storm Person';
   $data['stormperson']['table']['join'] = array(
     'node' => array(
       'left_field' => 'vid',
@@ -11,25 +11,19 @@
   );
   
   $data['stormperson']['organization_nid'] = array(
-    'title' => t('Person Organization NID'),
-    'help' => 'Storm Person Organization NID',
-    'field' => array(
-      'click sortable' => TRUE,
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort',
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric',
-    ),
-    'argument' => array(
-      'handler' => 'views_handler_argument_numeric',
+    'title' => t('Organization'),
+    'help' => t('Person -> Organization'),
+    'relationship' => array(
+      'base' => 'node',
+      'field' => 'nid',
+      'handler' => 'views_handler_relationship',
+      'label' => t('Person -> Organization'),
     ),
   );
   
   $data['stormperson']['organization_title'] = array(
-    'title' => t('Person Organization Title'),
-    'help' => 'Storm Person Organization Title',
+    'title' => t('Organization'),
+    'help' => t('Storm Person Organization (title only)'),
     'field' => array(
       'click sortable' => TRUE,
     ),
@@ -45,8 +39,8 @@
   );
   
   $data['stormperson']['prefix'] = array(
-    'title' => t('Person Prefix'),
-    'help' => 'Storm Person Prefix',
+    'title' => t('Prefix'),
+    'help' => t('Storm Person Prefix'),
     'field' => array(
       'click sortable' => TRUE,
     ),
@@ -62,8 +56,8 @@
   );
   
   $data['stormperson']['fullname'] = array(
-    'title' => t('Person Fullname'),
-    'help' => 'Storm Person Fullname',
+    'title' => t('Fullname'),
+    'help' => t('Storm Person Fullname'),
     'field' => array(
       'click sortable' => TRUE,
     ),
@@ -79,8 +73,8 @@
   );
   
   $data['stormperson']['email'] = array(
-    'title' => t('Person Email'),
-    'help' => 'Storm Person Email',
+    'title' => t('Email'),
+    'help' => t('Storm Person Email'),
     'field' => array(
       'click sortable' => TRUE,
     ),
@@ -96,8 +90,8 @@
   );
   
   $data['stormperson']['www'] = array(
-    'title' => t('Person WWW'),
-    'help' => 'Storm Person WWW',
+    'title' => t('WWW'),
+    'help' => t('Storm Person WWW'),
     'field' => array(
       'click sortable' => TRUE,
     ),
@@ -113,8 +107,8 @@
   );
   
   $data['stormperson']['phone'] = array(
-    'title' => t('Person Phone'),
-    'help' => 'Storm Person Phone',
+    'title' => t('Phone'),
+    'help' => t('Storm Person Phone'),
     'field' => array(
       'click sortable' => TRUE,
     ),
@@ -130,8 +124,8 @@
   );
   
   $data['stormperson']['im'] = array(
-    'title' => t('Person IM'),
-    'help' => 'Storm Person IM',
+    'title' => t('IM'),
+    'help' => t('Storm Person IM'),
     'field' => array(
       'click sortable' => TRUE,
     ),
@@ -147,19 +141,13 @@
   );
   
   $data['stormperson']['user_uid'] = array(
-    'title' => t('Person Drupal User ID'),
-    'help' => 'Storm Person Drupal User ID',
-    'field' => array(
-      'click sortable' => TRUE,
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort',
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric',
-    ),
-    'argument' => array(
-      'handler' => 'views_handler_argument_numeric',
+    'title' => t('Drupal User'),
+    'help' => t('Storm Person -> Drupal User'),
+    'relationship' => array(
+      'base' => 'user',
+      'field' => 'uid',
+      'handler' => 'views_handler_relationship',
+      'label' => t('Person -> User'),
     ),
   );
   
--- stormproject/stormproject.views.inc	Mon Jan 19 17:26:36 1970
+++ stormproject/stormproject.views.inc	Mon Jan 19 17:26:36 1970
@@ -2,7 +2,7 @@
 // $Id: stormproject.views.inc,v 1.1.2.7 2009/12/12 21:38:39 magnity Exp $
 
 function stormproject_views_data() {
-  $data['stormproject']['table']['group']  = 'Storm';
+  $data['stormproject']['table']['group']  = 'Storm Project';
   $data['stormproject']['table']['join'] = array(
     'node' => array(
       'left_field' => 'vid',
@@ -11,25 +11,19 @@
   );
   
   $data['stormproject']['organization_nid'] = array(
-    'title' => t('Project Organization Node ID'),
-    'help' => 'Storm Project Organization Node ID',
-    'field' => array(
-      'click sortable' => TRUE,
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort',
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric',
-    ),
-    'argument' => array(
-      'handler' => 'views_handler_argument_numeric',
+    'title' => t('Organization'),
+    'help' => t('Project -> Organization'),
+    'relationship' => array(
+      'base' => 'node',
+      'field' => 'nid',
+      'handler' => 'views_handler_relationship',
+      'label' => t('Project -> Organization'),
     ),
   );
   
   $data['stormproject']['organization_title'] = array(
-    'title' => t('Project Organization Title'),
-    'help' => 'Storm Project Organization Title',
+    'title' => t('Organization'),
+    'help' => t('Storm Project Organization (title only)'),
     'field' => array(
       'click sortable' => TRUE,
     ),
@@ -45,8 +39,8 @@
   );
   
   $data['stormproject']['projectstatus'] = array(
-    'title' => t('Project Status'),
-    'help' => 'Storm Project Status',
+    'title' => t('Status'),
+    'help' => t('Storm Project Status'),
     'field' => array(
       'click sortable' => TRUE,
       'handler' => 'stormattribute_handler_field_attributes_domain',
@@ -62,8 +56,8 @@
   );
   
   $data['stormproject']['projectcategory'] = array(
-    'title' => t('Project Category'),
-    'help' => 'Storm Project Category',
+    'title' => t('Category'),
+    'help' => t('Storm Project Category'),
     'field' => array(
       'click sortable' => TRUE,
       'handler' => 'stormattribute_handler_field_attributes_domain',
@@ -79,8 +73,8 @@
   );
   
   $data['stormproject']['projectpriority'] = array(
-    'title' => t('Project Priority'),
-    'help' => 'Storm Project Priority',
+    'title' => t('Priority'),
+    'help' => t('Storm Project Priority'),
     'field' => array(
       'click sortable' => TRUE,
       'handler' => 'stormattribute_handler_field_attributes_domain',
@@ -96,8 +90,8 @@
   );
   
   $data['stormproject']['pricemode'] = array(
-    'title' => t('Project Price Mode'),
-    'help' => 'Storm Project Price Mode',
+    'title' => t('Price Mode'),
+    'help' => t('Storm Project Price Mode'),
     'field' => array(
       'click sortable' => TRUE,
     ),
@@ -113,8 +107,8 @@
   );
   
   $data['stormproject']['price'] = array(
-    'title' => t('Project Price'),
-    'help' => 'Storm Project Price',
+    'title' => t('Price'),
+    'help' => t('Storm Project Price'),
     'field' => array(
       'click sortable' => TRUE,
     ),
@@ -130,8 +124,8 @@
   );
   
   $data['stormproject']['currency'] = array(
-    'title' => t('Project Currency'),
-    'help' => 'Storm Project Currency',
+    'title' => t('Currency'),
+    'help' => t('Storm Project Currency'),
     'field' => array(
       'click sortable' => TRUE,
     ),
@@ -147,8 +141,8 @@
   );
   
   $data['stormproject']['datebegin'] = array(
-    'title' => t('Project Date Begin'),
-    'help' => 'Storm Project Date Begin',
+    'title' => t('Date Begin'),
+    'help' => t('Storm Project Date Begin'),
     'field' => array(
       'click sortable' => TRUE,
       'handler' => 'views_handler_field_date',
@@ -162,8 +156,8 @@
   );
   
   $data['stormproject']['dateend'] = array(
-    'title' => t('Project Date End'),
-    'help' => 'Storm Project Date End',
+    'title' => t('Date End'),
+    'help' => t('Storm Project Date End'),
     'field' => array(
       'click sortable' => TRUE,
       'handler' => 'views_handler_field_date',
@@ -177,8 +171,8 @@
   );
   
   $data['stormproject']['duration unit'] = array(
-    'title' => t('Project Duration Unit'),
-    'help' => 'Storm Project Duration Unit',
+    'title' => t('Duration Unit'),
+    'help' => t('Storm Project Duration Unit'),
     'field' => array(
       'click sortable' => TRUE,
     ),
@@ -194,8 +188,8 @@
   );
   
   $data['stormproject']['duration'] = array(
-    'title' => t('Project Duration'),
-    'help' => 'Storm Project Duration',
+    'title' => t('Duration'),
+    'help' => t('Storm Project Duration'),
     'field' => array(
       'click sortable' => TRUE,
     ),
@@ -211,25 +205,19 @@
   );
   
   $data['stormproject']['manager_nid'] = array(
-    'title' => t('Project Manager Node ID'),
-    'help' => 'Storm Project Manager Node ID',
-    'field' => array(
-      'click sortable' => TRUE,
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort',
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_equality',
-    ),
-    'argument' => array(
-      'handler' => 'views_handler_argument_numeric',
+    'title' => t('Manager'),
+    'help' => t('Project -> Manager'),
+    'relationship' => array(
+      'base' => 'node',
+      'field' => 'nid',
+      'handler' => 'views_handler_relationship',
+      'label' => t('Project -> Manager'),
     ),
   );
   
   $data['stormproject']['manager_title'] = array(
-    'title' => t('Project Manager Title'),
-    'help' => 'Storm Project Manager Title',
+    'title' => t('Project Manager'),
+    'help' => t('Storm Project Manager (title only)'),
     'field' => array(
       'click sortable' => TRUE,
     ),
@@ -245,25 +233,19 @@
   );
   
   $data['stormproject']['assigned_nid'] = array(
-    'title' => t('Project Assigned Node ID'),
-    'help' => 'Storm Project Assigned Node ID',
-    'field' => array(
-      'click sortable' => TRUE,
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort',
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_equality',
-    ),
-    'argument' => array(
-      'handler' => 'views_handler_argument_numeric',
+    'title' => t('Assigned'),
+    'help' => t('Project -> Assigned'),
+    'relationship' => array(
+      'base' => 'node',
+      'field' => 'nid',
+      'handler' => 'views_handler_relationship',
+      'label' => t('Project -> Assigned'),
     ),
   );
   
   $data['stormproject']['assigned_title'] = array(
-    'title' => t('Project Assigned Title'),
-    'help' => 'Storm Project Assigned Title',
+    'title' => t('Assigned'),
+    'help' => t('Storm Project Assigned (title only)'),
     'field' => array(
       'click sortable' => TRUE,
     ),
--- stormtask/stormtask.views.inc	Mon Jan 19 17:26:36 1970
+++ stormtask/stormtask.views.inc	Mon Jan 19 17:26:36 1970
@@ -2,7 +2,7 @@
 // $Id: stormtask.views.inc,v 1.1.2.6 2009/12/17 22:51:46 magnity Exp $
 
 function stormtask_views_data() {
-  $data['stormtask']['table']['group']  = 'Storm';
+  $data['stormtask']['table']['group']  = 'Storm Task';
   $data['stormtask']['table']['join'] = array(
     'node' => array(
       'left_field' => 'vid',
@@ -11,8 +11,8 @@
   );
   
   $data['stormtask']['stepno'] = array(
-    'title' => t('Task Step Number'),
-    'help' => 'Storm Task Step Number',
+    'title' => t('Step Number'),
+    'help' => t('Storm Task Step Number'),
     'field' => array(
       'click sortable' => TRUE,
     ),
@@ -28,25 +28,19 @@
   );
   
   $data['stormtask']['organization_nid'] = array(
-    'title' => t('Task Organization Node ID'),
-    'help' => 'Storm Task Organization Node ID',
-    'field' => array(
-      'click sortable' => TRUE,
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort',
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric',
-    ),
-    'argument' => array(
-      'handler' => 'views_handler_argument_numeric',
+    'title' => t('Organization'),
+    'help' => t('Task -> Organization'),
+    'relationship' => array(
+      'base' => 'node',
+      'field' => 'nid',
+      'handler' => 'views_handler_relationship',
+      'label' => t('Task -> Organization'),
     ),
   );
   
   $data['stormtask']['organization_title'] = array(
-    'title' => t('Task Organization Title'),
-    'help' => 'Storm Task Organization Title',
+    'title' => t('Organization'),
+    'help' => t('Storm Task Organization (title only)'),
     'field' => array(
       'click sortable' => TRUE,
     ),
@@ -62,25 +56,19 @@
   );
   
   $data['stormtask']['project_nid'] = array(
-    'title' => t('Task Project Node ID'),
-    'help' => 'Storm Task Project Node ID',
-    'field' => array(
-      'click sortable' => TRUE,
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort',
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric',
-    ),
-    'argument' => array(
-      'handler' => 'views_handler_argument_numeric',
+    'title' => t('Project'),
+    'help' => t('Task -> Project'),
+    'relationship' => array(
+      'base' => 'node',
+      'field' => 'nid',
+      'handler' => 'views_handler_relationship',
+      'label' => t('Task -> Project'),
     ),
   );
 
   $data['stormtask']['project_title'] = array(
-    'title' => t('Task Project Title'),
-    'help' => 'Storm Task Project Title',
+    'title' => t('Project'),
+    'help' => t('Storm Task Project (title only)'),
     'field' => array(
       'click sortable' => TRUE,
     ),
@@ -96,25 +84,19 @@
   );
 
   $data['stormtask']['parent_nid'] = array(
-    'title' => t('Task Parent Task Node ID'),
-    'help' => 'Storm Task Patent Task Node ID',
-    'field' => array(
-      'click sortable' => TRUE,
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort',
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric',
-    ),
-    'argument' => array(
-      'handler' => 'views_handler_argument_numeric',
+    'title' => t('Parent Task'),
+    'help' => t('Task -> Parent Task'),
+    'relationship' => array(
+      'base' => 'node',
+      'field' => 'nid',
+      'handler' => 'views_handler_relationship',
+      'label' => t('Task -> Parent Task'),
     ),
   );
 
   $data['stormtask']['weight'] = array(
-    'title' => t('Task Weight'),
-    'help' => 'Storm Task Weight',
+    'title' => t('Weight'),
+    'help' => t('Storm Task Weight'),
     'field' => array(
       'click sortable' => TRUE,
     ),
@@ -130,8 +112,8 @@
   );
 
   $data['stormtask']['taskstatus'] = array(
-    'title' => t('Task Status'),
-    'help' => 'Storm Task Status',
+    'title' => t('Status'),
+    'help' => t('Storm Task Status'),
     'field' => array(
       'click sortable' => TRUE,
       'handler' => 'stormattribute_handler_field_attributes_domain',
@@ -147,8 +129,8 @@
   );
 
   $data['stormtask']['taskcategory'] = array(
-    'title' => t('Task Category'),
-    'help' => 'Storm Task Category',
+    'title' => t('Category'),
+    'help' => t('Storm Task Category'),
     'field' => array(
       'click sortable' => TRUE,
       'handler' => 'stormattribute_handler_field_attributes_domain',
@@ -164,8 +146,8 @@
   );
 
   $data['stormtask']['taskpriority'] = array(
-    'title' => t('Task Priority'),
-    'help' => 'Storm Task Priority',
+    'title' => t('Priority'),
+    'help' => t('Storm Task Priority'),
     'field' => array(
       'click sortable' => TRUE,
       'handler' => 'stormattribute_handler_field_attributes_domain',
@@ -181,8 +163,8 @@
   );
 
   $data['stormtask']['pricemode'] = array(
-    'title' => t('Task Price Mode'),
-    'help' => 'Storm Task Price Mode',
+    'title' => t('Price Mode'),
+    'help' => t('Storm Task Price Mode'),
     'field' => array(
       'click sortable' => TRUE,
     ),
@@ -198,8 +180,8 @@
   );
 
   $data['stormtask']['price'] = array(
-    'title' => t('Task Price'),
-    'help' => 'Storm Task Price',
+    'title' => t('Price'),
+    'help' => t('Storm Task Price'),
     'field' => array(
       'click sortable' => TRUE,
     ),
@@ -215,8 +197,8 @@
   );
 
   $data['stormtask']['currency'] = array(
-    'title' => t('Task Currency'),
-    'help' => 'Storm Task Currency',
+    'title' => t('Currency'),
+    'help' => t('Storm Task Currency'),
     'field' => array(
       'click sortable' => TRUE,
     ),
@@ -232,8 +214,8 @@
   );
 
   $data['stormtask']['datebegin'] = array(
-    'title' => t('Task Date Begin'),
-    'help' => 'Storm Task Date Begin',
+    'title' => t('Date Begin'),
+    'help' => t('Storm Task Date Begin'),
     'field' => array(
       'click sortable' => TRUE,
       'handler' => 'views_handler_field_date',
@@ -247,8 +229,8 @@
   );
 
   $data['stormtask']['dateend'] = array(
-    'title' => t('Task Date End'),
-    'help' => 'Storm Task Date End',
+    'title' => t('Date End'),
+    'help' => t('Storm Task Date End'),
     'field' => array(
       'click sortable' => TRUE,
       'handler' => 'views_handler_field_date',
@@ -262,8 +244,8 @@
   );
 
   $data['stormtask']['durationunit'] = array(
-    'title' => t('Task Duration Unit'),
-    'help' => 'Storm Task Duration Unit',
+    'title' => t('Duration Unit'),
+    'help' => t('Storm Task Duration Unit'),
     'field' => array(
       'click sortable' => TRUE,
     ),
@@ -279,8 +261,8 @@
   );
 
   $data['stormtask']['duration'] = array(
-    'title' => t('Task Duration'),
-    'help' => 'Storm Task Duration',
+    'title' => t('Duration'),
+    'help' => t('Storm Task Duration'),
     'field' => array(
       'click sortable' => TRUE,
     ),
@@ -296,25 +278,19 @@
   );
   
   $data['stormtask']['assigned_nid'] = array(
-    'title' => t('Task Assigned Node ID'),
-    'help' => 'Storm Task Assigned Node ID',
-    'field' => array(
-      'click sortable' => TRUE,
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort',
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_equality',
-    ),
-    'argument' => array(
-      'handler' => 'views_handler_argument_numeric',
+    'title' => t('Assigned'),
+    'help' => t('Task -> Assigned'),
+    'relationship' => array(
+      'base' => 'node',
+      'field' => 'nid',
+      'handler' => 'views_handler_relationship',
+      'label' => t('Task -> Assigned'),
     ),
   );
   
   $data['stormtask']['assigned_title'] = array(
-    'title' => t('Task Assigned Title'),
-    'help' => 'Storm Task Assigned Title',
+    'title' => t('Assigned'),
+    'help' => t('Storm Task Assigned (title only)'),
     'field' => array(
       'click sortable' => TRUE,
     ),
--- stormticket/stormticket.views.inc	Mon Jan 19 17:26:36 1970
+++ stormticket/stormticket.views.inc	Mon Jan 19 17:26:36 1970
@@ -2,7 +2,7 @@
 // $Id: stormticket.views.inc,v 1.1.2.10 2010/04/23 15:59:19 juliangb Exp $
 
 function stormticket_views_data() {
-  $data['stormticket']['table']['group']  = 'Storm';
+  $data['stormticket']['table']['group']  = 'Storm Ticket';
   $data['stormticket']['table']['join'] = array(
     'node' => array(
       'left_field' => 'vid',
@@ -11,8 +11,8 @@
   );
   
   $data['stormticket']['ticketstatus'] = array(
-    'title' => t('Ticket Status'),
-    'help' => 'Storm Ticket status',
+    'title' => t('Status'),
+    'help' => t('Storm Ticket Status'),
     'field' => array(
       'click sortable' => TRUE,
       'handler' => 'stormattribute_handler_field_attributes_domain',
@@ -28,7 +28,7 @@
   );
 
   $data['stormticket']['ticketcategory'] = array(
-    'title' => t('Ticket Category'),
+    'title' => t('Category'),
     'help' => t('Storm Ticket category'),
     'field' => array(
       'click sortable' => TRUE,
@@ -45,7 +45,7 @@
   );
 
   $data['stormticket']['ticketpriority'] = array(
-    'title' => t('Ticket Priority'),
+    'title' => t('Priority'),
     'help' => t('Storm Ticket priority'),
     'field' => array(
       'click sortable' => TRUE,
@@ -62,7 +62,7 @@
   );
 
   $data['stormticket']['datebegin'] = array(
-    'title' => t('Ticket Date Begin'),
+    'title' => t('Date Begin'),
     'help' => t('Storm Ticket begin date'),
     'field' => array(
       'click sortable' => TRUE,
@@ -77,7 +77,7 @@
   );
 
   $data['stormticket']['dateend'] = array(
-    'title' => t('Ticket Date End'),
+    'title' => t('Date End'),
     'help' => t('Storm Ticket end date'),
     'field' => array(
       'click sortable' => TRUE,
@@ -92,25 +92,19 @@
   );
   
   $data['stormticket']['organization_nid'] = array(
-    'title' => t('Ticket Organization NID'),
-    'help' => 'Storm Ticket Organization NID',
-    'field' => array(
-      'click sortable' => TRUE,
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort',
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric',
-    ),
-    'argument' => array(
-      'handler' => 'views_handler_argument_numeric',
+    'title' => t('Organization'),
+    'help' => t('Ticket -> Organization'),
+    'relationship' => array(
+      'base' => 'node',
+      'field' => 'nid',
+      'handler' => 'views_handler_relationship',
+      'label' => t('Ticket -> Organization'),
     ),
   );
   
   $data['stormticket']['organization_title'] = array(
-    'title' => t('Ticket Organization'),
-    'help' => t('Storm Ticket organization'),
+    'title' => t('Organization'),
+    'help' => t('Storm Ticket Organization (title only)'),
     'field' => array(
       'click sortable' => TRUE,
     ),
@@ -126,25 +120,19 @@
   );
 
   $data['stormticket']['project_nid'] = array(
-    'title' => t('Ticket Project NID'),
-    'help' => 'Storm Ticket Project NID',
-    'field' => array(
-      'click sortable' => TRUE,
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort',
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric',
-    ),
-    'argument' => array(
-      'handler' => 'views_handler_argument_numeric',
+    'title' => t('Project'),
+    'help' => t('Ticket -> Project'),
+    'relationship' => array(
+      'base' => 'node',
+      'field' => 'nid',
+      'handler' => 'views_handler_relationship',
+      'label' => t('Ticket -> Project'),
     ),
   );
   
   $data['stormticket']['project_title'] = array(
-    'title' => t('Ticket Project'),
-    'help' => t('Storm Ticket project'),
+    'title' => t('Project'),
+    'help' => t('Storm Ticket Project (title only)'),
     'field' => array(
       'click sortable' => TRUE,
     ),
@@ -160,25 +148,19 @@
   );
 
   $data['stormticket']['task_nid'] = array(
-    'title' => t('Ticket Task NID'),
-    'help' => 'Storm Ticket Task NID',
-    'field' => array(
-      'click sortable' => TRUE,
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort',
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric',
-    ),
-    'argument' => array(
-      'handler' => 'views_handler_argument_numeric',
+    'title' => t('Task'),
+    'help' => t('Ticket -> Task'),
+    'relationship' => array(
+      'base' => 'node',
+      'field' => 'nid',
+      'handler' => 'views_handler_relationship',
+      'label' => t('Ticket -> Task'),
     ),
   );
   
   $data['stormticket']['task_title'] = array(
-    'title' => t('Ticket Task'),
-    'help' => t('Storm Task title'),
+    'title' => t('Task'),
+    'help' => t('Storm Ticket Task (title only)'),
     'field' => array(
       'click sortable' => TRUE,
     ),
@@ -194,25 +176,19 @@
   );
   
   $data['stormticket']['assigned_nid'] = array(
-    'title' => t('Ticket Assigned Node ID'),
-    'help' => 'Storm Ticket Assigned Node ID',
-    'field' => array(
-      'click sortable' => TRUE,
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort',
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_equality',
-    ),
-    'argument' => array(
-      'handler' => 'views_handler_argument_numeric',
+    'title' => t('Assigned'),
+    'help' => t('Ticket -> Assigned'),
+    'relationship' => array(
+      'base' => 'node',
+      'field' => 'nid',
+      'handler' => 'views_handler_relationship',
+      'label' => t('Ticket -> Assigned'),
     ),
   );
   
   $data['stormticket']['assigned_title'] = array(
-    'title' => t('Ticket Assigned Title'),
-    'help' => 'Storm Ticket Assigned Title',
+    'title' => t('Assigned'),
+    'help' => t('Storm Ticket Assigned (title only)'),
     'field' => array(
       'click sortable' => TRUE,
     ),
--- stormtimetracking/stormtimetracking.views.inc	Mon Jan 19 17:26:36 1970
+++ stormtimetracking/stormtimetracking.views.inc	Mon Jan 19 17:26:36 1970
@@ -2,7 +2,7 @@
 // $Id: stormtimetracking.views.inc,v 1.1.2.6 2010/03/18 15:11:08 juliangb Exp $
 
 function stormtimetracking_views_data() {
-  $data['stormtimetracking']['table']['group']  = 'Storm';
+  $data['stormtimetracking']['table']['group']  = 'Storm Timetracking';
   $data['stormtimetracking']['table']['join'] = array(
     'node' => array(
       'left_field' => 'vid',
@@ -11,25 +11,19 @@
   );
   
   $data['stormtimetracking']['organization_nid'] = array(
-    'title' => t('Timetracking Organization Node ID'),
-    'help' => 'Storm Timetracking Organization Node ID',
-    'field' => array(
-      'click sortable' => TRUE,
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort',
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric',
-    ),
-    'argument' => array(
-      'handler' => 'views_handler_argument_numeric',
+    'title' => t('Organization'),
+    'help' => t('Timetracking -> Organization'),
+    'relationship' => array(
+      'base' => 'node',
+      'field' => 'nid',
+      'handler' => 'views_handler_relationship',
+      'label' => t('Timetracking -> Organization'),
     ),
   );
   
   $data['stormtimetracking']['organization_title'] = array(
-    'title' => t('Timetracking Organization Title'),
-    'help' => 'Storm Timetracking Organization Title',
+    'title' => t('Organization'),
+    'help' => t('Storm Timetracking Organization (title only)'),
     'field' => array(
       'click sortable' => TRUE,
     ),
@@ -45,25 +39,19 @@
   );
   
   $data['stormtimetracking']['project_nid'] = array(
-    'title' => t('Timetracking Project Node ID'),
-    'help' => 'Storm Timetracking Project Node ID',
-    'field' => array(
-      'click sortable' => TRUE,
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort',
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric',
-    ),
-    'argument' => array(
-      'handler' => 'views_handler_argument_numeric',
+    'title' => t('Project'),
+    'help' => t('Timetracking -> Project'),
+    'relationship' => array(
+      'base' => 'node',
+      'field' => 'nid',
+      'handler' => 'views_handler_relationship',
+      'label' => t('Timetracking -> Project'),
     ),
   );
   
   $data['stormtimetracking']['project_title'] = array(
-    'title' => t('Timetracking Project Title'),
-    'help' => 'Storm Timetracking Project Title',
+    'title' => t('Project'),
+    'help' => t('Storm Timetracking Project (title only)'),
     'field' => array(
       'click sortable' => TRUE,
     ),
@@ -79,25 +67,19 @@
   );
   
   $data['stormtimetracking']['task_nid'] = array(
-    'title' => t('Timetracking Task Node ID'),
-    'help' => 'Storm Timetracking Task Node ID',
-    'field' => array(
-      'click sortable' => TRUE,
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort',
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric',
-    ),
-    'argument' => array(
-      'handler' => 'views_handler_argument_numeric',
+    'title' => t('Task'),
+    'help' => t('Timetracking -> Task'),
+    'relationship' => array(
+      'base' => 'node',
+      'field' => 'nid',
+      'handler' => 'views_handler_relationship',
+      'label' => t('Timetracking -> Task'),
     ),
   );
   
   $data['stormtimetracking']['task_stepno'] = array(
-    'title' => t('Timetracking Task Step Number'),
-    'help' => 'Storm Timetracking Task Step Number',
+    'title' => t('Task Step Number'),
+    'help' => t('Storm Timetracking Task Step Number'),
     'field' => array(
       'click sortable' => TRUE,
     ),
@@ -113,8 +95,8 @@
   );
   
   $data['stormtimetracking']['task_title'] = array(
-    'title' => t('Timetracking Task Title'),
-    'help' => 'Storm Timetracking Task Title',
+    'title' => t('Task'),
+    'help' => t('Storm Timetracking Task (title only)'),
     'field' => array(
       'click sortable' => TRUE,
     ),
@@ -130,25 +112,19 @@
   );
   
   $data['stormtimetracking']['ticket_nid'] = array(
-    'title' => t('Timetracking Ticket Node ID'),
-    'help' => 'Storm Timetracking Ticket Node ID',
-    'field' => array(
-      'click sortable' => TRUE,
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort',
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric',
-    ),
-    'argument' => array(
-      'handler' => 'views_handler_argument_numeric',
+    'title' => t('Ticket'),
+    'help' => t('Timetracking -> Ticket'),
+    'relationship' => array(
+      'base' => 'node',
+      'field' => 'nid',
+      'handler' => 'views_handler_relationship',
+      'label' => t('Timetracking -> Ticket'),
     ),
   );
   
   $data['stormtimetracking']['ticket_title'] = array(
-    'title' => t('Timetracking Ticket Title'),
-    'help' => 'Storm Timetracking Ticket Title',
+    'title' => t('Ticket'),
+    'help' => t('Storm Timetracking Ticket (title only)'),
     'field' => array(
       'click sortable' => TRUE,
     ),
@@ -164,8 +140,8 @@
   );
   
   $data['stormtimetracking']['trackingdate'] = array(
-    'title' => t('Timetracking Tracking Date'),
-    'help' => 'Storm Timetracking Tracking Date',
+    'title' => t('Tracking Date'),
+    'help' => t('Storm Timetracking Tracking Date'),
     'field' => array(
       'click sortable' => TRUE,
       'handler' => 'views_handler_field_date',
@@ -179,8 +155,8 @@
   );
   
   $data['stormtimetracking']['timebegin'] = array(
-    'title' => t('Timetracking Time Begin'),
-    'help' => 'Storm Timetracking Time Begin',
+    'title' => t('Time Begin'),
+    'help' => t('Storm Timetracking Time Begin'),
     'field' => array(
       'click sortable' => TRUE,
     ),
@@ -190,8 +166,8 @@
   );
   
   $data['stormtimetracking']['timeend'] = array(
-    'title' => t('Timetracking Time End'),
-    'help' => 'Storm Timetracking Time End',
+    'title' => t('Time End'),
+    'help' => t('Storm Timetracking Time End'),
     'field' => array(
       'click sortable' => TRUE,
     ),
@@ -201,8 +177,8 @@
   );
   
   $data['stormtimetracking']['duration'] = array(
-    'title' => t('Timetracking Duration'),
-    'help' => 'Storm Timetracking Duration',
+    'title' => t('Duration'),
+    'help' => t('Storm Timetracking Duration'),
     'field' => array(
       'click sortable' => TRUE,
     ),
@@ -212,8 +188,8 @@
   );
   
   $data['stormtimetracking']['billing_duration'] = array(
-    'title' => t('Timetracking Billing Duration'),
-    'help' => 'Storm Timetracking Billing Duration',
+    'title' => t('Billing Duration'),
+    'help' => t('Storm Timetracking Billing Duration'),
     'field' => array(
       'click sortable' => TRUE,
     ),
@@ -223,8 +199,8 @@
   );
   
   $data['stormtimetracking']['billable'] = array(
-    'title' => t('Timetracking Billable'),
-    'help' => 'Storm Timetracking Billable',
+    'title' => t('Billable'),
+    'help' => t('Storm Timetracking Billable'),
     'field' => array(
       'click sortable' => TRUE,
     ),
@@ -237,8 +213,8 @@
   );
   
   $data['stormtimetracking']['billed'] = array(
-    'title' => t('Timetracking Billed'),
-    'help' => 'Storm Timetracking Billed',
+    'title' => t('Billed'),
+    'help' => t('Storm Timetracking Billed'),
     'field' => array(
       'click sortable' => TRUE,
     ),