diff --git a/sources/node/tmgmt_node.info b/sources/node/tmgmt_node.info
index 75a5a2d..34ef86e 100644
--- a/sources/node/tmgmt_node.info
+++ b/sources/node/tmgmt_node.info
@@ -15,3 +15,4 @@ files[] = tmgmt_node.test
 files[] = views/tmgmt_node.views.inc
 files[] = views/handlers/tmgmt_node_handler_field_translation_language_status.inc
 files[] = views/handlers/tmgmt_node_handler_field_translation_language_status_single.inc
+files[] = views/handlers/tmgmt_node_handler_filter_node_translatable_types.inc
diff --git a/sources/node/ui/tmgmt_node_ui.overview.test b/sources/node/ui/tmgmt_node_ui.overview.test
index 61d3924..639770f 100644
--- a/sources/node/ui/tmgmt_node_ui.overview.test
+++ b/sources/node/ui/tmgmt_node_ui.overview.test
@@ -3,7 +3,7 @@
 /**
  * Content Overview Tests
  */
-class TMGMTNodeSourceUIOverviewTestCase extends TMGMTBaseTestCase {
+class TMGMTNodeSourceUIOverviewTestCase extends TMGMTEntityTestCaseUtility {
 
   /**
    * Implements getInfo().
@@ -22,7 +22,6 @@ class TMGMTNodeSourceUIOverviewTestCase extends TMGMTBaseTestCase {
    */
   function setUp() {
     parent::setUp(array('tmgmt_node_ui'));
-    variable_set('language_content_type_page', TRANSLATION_ENABLED);
 
     $this->loginAsAdmin();
 
@@ -31,20 +30,9 @@ class TMGMTNodeSourceUIOverviewTestCase extends TMGMTBaseTestCase {
     $this->setEnvironment('es');
     $this->setEnvironment('el');
 
-    // Copied from standard.install
-    $type = array(
-      'type' => 'page',
-      'name' => st('Basic page'),
-      'base' => 'node_content',
-      'description' => st("Use <em>basic pages</em> for your static content, such as an 'About us' page."),
-      'custom' => 1,
-      'modified' => 1,
-      'locked' => 0,
-    );
-    $type = node_type_set_defaults($type);
-    node_type_save($type);
-    node_add_body_field($type);
-    node_types_rebuild();
+    $this->createNodeType('page', 'Page', TRANSLATION_ENABLED, FALSE);
+    // 1 means that the node type can have a language but is not translatable.
+    $this->createNodeType('untranslated', 'Untranslated', 1, FALSE);
 
     $this->checkPermissions(array(), TRUE);
 
@@ -74,6 +62,12 @@ class TMGMTNodeSourceUIOverviewTestCase extends TMGMTBaseTestCase {
     $node3 = $this->drupalCreateNode(array('type' => 'page', 'language' => 'en', 'body' => array('en' => array(array()))));
     $node4 = $this->drupalCreateNode(array('type' => 'page', 'language' => 'en', 'body' => array('en' => array(array()))));
 
+    // Create a node with an undefined language.
+    $node5 = $this->drupalCreateNode(array('type' => 'page'));
+
+    // Create a node of an untranslatable content type.
+    $node6 = $this->drupalCreateNode(array('type' => 'untranslated', 'language' => 'en', 'body' => array('en' => array(array()))));
+
     // Go to the overview page and make sure the nodes are there.
     $this->drupalGet('admin/tmgmt/sources/node');
 
@@ -81,6 +75,8 @@ class TMGMTNodeSourceUIOverviewTestCase extends TMGMTBaseTestCase {
     $this->assertText($node2->title);
     $this->assertText($node3->title);
     $this->assertText($node4->title);
+    $this->assertNoText($node5->title);
+    $this->assertNoText($node6->title);
 
     // Now translate them.
     $edit = array(
diff --git a/sources/node/ui/tmgmt_node_ui.test b/sources/node/ui/tmgmt_node_ui.test
index 5fac640..1957459 100644
--- a/sources/node/ui/tmgmt_node_ui.test
+++ b/sources/node/ui/tmgmt_node_ui.test
@@ -4,7 +4,7 @@
  * Basic Node Source tests.
  *
  */
-class TMGMTNodeSourceUITestCase extends TMGMTBaseTestCase {
+class TMGMTNodeSourceUITestCase extends TMGMTEntityTestCaseUtility {
 
   /**
    * Implements getInfo().
@@ -22,7 +22,6 @@ class TMGMTNodeSourceUITestCase extends TMGMTBaseTestCase {
    */
   function setUp() {
     parent::setUp(array('tmgmt_node_ui', 'block'));
-    variable_set('language_content_type_page', TRANSLATION_ENABLED);
 
     // We need the administer blocks permission.
     $this->loginAsAdmin(array('administer blocks'));
@@ -39,23 +38,10 @@ class TMGMTNodeSourceUITestCase extends TMGMTBaseTestCase {
     );
     $this->drupalPost('admin/structure/block', $edit, t('Save blocks'));
 
-    // Copied from standard.install
-    $type = array(
-      'type' => 'page',
-      'name' => st('Basic page'),
-      'base' => 'node_content',
-      'description' => st("Use <em>basic pages</em> for your static content, such as an 'About us' page."),
-      'custom' => 1,
-      'modified' => 1,
-      'locked' => 0,
-    );
-    $type = node_type_set_defaults($type);
-    node_type_save($type);
-    node_add_body_field($type);
-    node_types_rebuild();
+    $this->createNodeType('page', 'Page', TRANSLATION_ENABLED, FALSE);
   }
 
-    /**
+  /**
    * Tests the create, submit and accept permissions.
    */
   function testPermissions() {
diff --git a/sources/node/views/handlers/tmgmt_node_handler_filter_node_translatable_types.inc b/sources/node/views/handlers/tmgmt_node_handler_filter_node_translatable_types.inc
new file mode 100644
index 0000000..86dff0c
--- /dev/null
+++ b/sources/node/views/handlers/tmgmt_node_handler_filter_node_translatable_types.inc
@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * @file
+ * Contains tmgmt_node_ui_handler_filter_node_translatable_types.
+ */
+
+/**
+ * Limits node types to those enabled for content translation.
+ */
+class tmgmt_node_ui_handler_filter_node_translatable_types extends views_handler_filter {
+
+  /**
+   * {@inheritdoc}
+   */
+  function query() {
+    $this->ensure_my_table();
+    $valid_types = array_keys(tmgmt_source_translatable_item_types('node'));
+    $this->query->add_where($this->options['group'], "$this->table_alias.$this->real_field", array_values($valid_types), 'IN');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  function admin_summary() { }
+}
diff --git a/sources/node/views/tmgmt_node.views.inc b/sources/node/views/tmgmt_node.views.inc
index 0f0051a..3ac0168 100644
--- a/sources/node/views/tmgmt_node.views.inc
+++ b/sources/node/views/tmgmt_node.views.inc
@@ -59,11 +59,10 @@ class TMGMTNodeSourceViewsController extends TMGMTDefaultSourceViewsController {
         ),
       ),
     );
-    // @TODO: What about a translation managment group?
-    // Comment from fubhy: Yes, let's do that :)
     $data['node']['tmgmt_translatable_types'] = array(
-      'title' => t('Translatable types'),
-      'help' => t('Display only nodes from node types which are translatable'),
+      'group' => t('Content translation'),
+      'title' => t('All translatable types'),
+      'help' => t('Enforces that only nodes from node types which are translatable are '),
       'filter' => array(
         'handler' => 'tmgmt_node_ui_handler_filter_node_translatable_types',
         'real field' => 'type',
@@ -100,6 +99,7 @@ class TMGMTNodeSourceViewsController extends TMGMTDefaultSourceViewsController {
       ),
     );
     $data['node']['translation_language_status'] = array(
+      'group' => t('Content translation'),
       'title' => t('All translation languages'),
       'help' => t('Display all target lanuages.'),
       'real field' => 'tnid',
@@ -114,11 +114,10 @@ class TMGMTNodeSourceViewsController extends TMGMTDefaultSourceViewsController {
         'handler' => 'tmgmt_node_handler_field_translation_language_status_single',
       ),
     );
-    // @todo Remove that once it has a generic implementation in the default
-    // controller.
-    $data['node']['tmgmt_translatable_types'] = array(
-      'title' => t('Translatable types'),
-      'help' => t('Filter translatable elements based on their types.'),
+    $data['node']['tmgmt_translatable_types_exposed'] = array(
+      'group' => t('Content translation'),
+      'title' => t('Select translatable content types'),
+      'help' => t('Allows to filter on specific translatable types.'),
       'filter' => array(
         'handler' => 'views_handler_filter_in_operator',
         'real field' => 'type',
diff --git a/sources/node/views/tmgmt_node_source_overview.view.inc b/sources/node/views/tmgmt_node_source_overview.view.inc
index 036e82e..b40ff61 100644
--- a/sources/node/views/tmgmt_node_source_overview.view.inc
+++ b/sources/node/views/tmgmt_node_source_overview.view.inc
@@ -1,6 +1,6 @@
 <?php
 
-$view = new view;
+$view = new view();
 $view->name = 'tmgmt_node_source_overview';
 $view->description = 'Node source overview for bulk operations.';
 $view->tag = 'Translation Management';
@@ -13,6 +13,7 @@ $view->disabled = FALSE; /* Edit this to true to make a default view disabled in
 /* Display: Master */
 $handler = $view->new_display('default', 'Master', 'default');
 $handler->display->display_options['title'] = 'Content overview';
+$handler->display->display_options['use_more_always'] = FALSE;
 $handler->display->display_options['group_by'] = TRUE;
 $handler->display->display_options['access']['type'] = 'perm';
 $handler->display->display_options['access']['perm'] = 'create translation jobs';
@@ -43,7 +44,6 @@ $handler->display->display_options['style_options']['info'] = array(
 $handler->display->display_options['empty']['area']['id'] = 'area';
 $handler->display->display_options['empty']['area']['table'] = 'views';
 $handler->display->display_options['empty']['area']['field'] = 'area';
-$handler->display->display_options['empty']['area']['empty'] = FALSE;
 $handler->display->display_options['empty']['area']['content'] = 'There are no nodes that match the specified filter criteria.';
 $handler->display->display_options['empty']['area']['format'] = 'filtered_html';
 /* Relationship: User */
@@ -58,71 +58,56 @@ $handler->display->display_options['fields']['views_bulk_operations']['table'] =
 $handler->display->display_options['fields']['views_bulk_operations']['field'] = 'views_bulk_operations';
 $handler->display->display_options['fields']['views_bulk_operations']['ui_name'] = 'Bulk operations';
 $handler->display->display_options['fields']['views_bulk_operations']['label'] = '<!--views-bulk-operations-select-all-->';
-$handler->display->display_options['fields']['views_bulk_operations']['alter']['alter_text'] = 0;
-$handler->display->display_options['fields']['views_bulk_operations']['alter']['make_link'] = 0;
-$handler->display->display_options['fields']['views_bulk_operations']['alter']['absolute'] = 0;
-$handler->display->display_options['fields']['views_bulk_operations']['alter']['external'] = 0;
-$handler->display->display_options['fields']['views_bulk_operations']['alter']['replace_spaces'] = 0;
-$handler->display->display_options['fields']['views_bulk_operations']['alter']['trim_whitespace'] = 0;
-$handler->display->display_options['fields']['views_bulk_operations']['alter']['nl2br'] = 0;
-$handler->display->display_options['fields']['views_bulk_operations']['alter']['word_boundary'] = 1;
-$handler->display->display_options['fields']['views_bulk_operations']['alter']['ellipsis'] = 1;
-$handler->display->display_options['fields']['views_bulk_operations']['alter']['more_link'] = 0;
-$handler->display->display_options['fields']['views_bulk_operations']['alter']['strip_tags'] = 0;
-$handler->display->display_options['fields']['views_bulk_operations']['alter']['trim'] = 0;
-$handler->display->display_options['fields']['views_bulk_operations']['alter']['html'] = 0;
-$handler->display->display_options['fields']['views_bulk_operations']['element_label_colon'] = 0;
-$handler->display->display_options['fields']['views_bulk_operations']['element_default_classes'] = 1;
-$handler->display->display_options['fields']['views_bulk_operations']['hide_empty'] = 0;
-$handler->display->display_options['fields']['views_bulk_operations']['empty_zero'] = 0;
-$handler->display->display_options['fields']['views_bulk_operations']['hide_alter_empty'] = 1;
-$handler->display->display_options['fields']['views_bulk_operations']['vbo']['entity_load_capacity'] = '10';
-$handler->display->display_options['fields']['views_bulk_operations']['vbo']['operations'] = array(
+$handler->display->display_options['fields']['views_bulk_operations']['element_label_colon'] = FALSE;
+$handler->display->display_options['fields']['views_bulk_operations']['vbo_settings']['display_type'] = '1';
+$handler->display->display_options['fields']['views_bulk_operations']['vbo_settings']['enable_select_all_pages'] = 1;
+$handler->display->display_options['fields']['views_bulk_operations']['vbo_settings']['force_single'] = 0;
+$handler->display->display_options['fields']['views_bulk_operations']['vbo_settings']['entity_load_capacity'] = '10';
+$handler->display->display_options['fields']['views_bulk_operations']['vbo_operations'] = array(
   'action::node_assign_owner_action' => array(
     'selected' => 0,
-    'use_queue' => 0,
     'skip_confirmation' => 0,
     'override_label' => 0,
     'label' => '',
+    'postpone_processing' => 0,
   ),
   'action::views_bulk_operations_delete_item' => array(
     'selected' => 0,
-    'use_queue' => 0,
     'skip_confirmation' => 0,
     'override_label' => 0,
     'label' => '',
+    'postpone_processing' => 0,
   ),
   'action::system_message_action' => array(
     'selected' => 0,
-    'use_queue' => 0,
     'skip_confirmation' => 0,
     'override_label' => 0,
     'label' => '',
+    'postpone_processing' => 0,
   ),
   'action::views_bulk_operations_script_action' => array(
     'selected' => 0,
-    'use_queue' => 0,
     'skip_confirmation' => 0,
     'override_label' => 0,
     'label' => '',
+    'postpone_processing' => 0,
   ),
   'action::node_make_sticky_action' => array(
     'selected' => 0,
-    'use_queue' => 0,
     'skip_confirmation' => 0,
     'override_label' => 0,
     'label' => '',
+    'postpone_processing' => 0,
   ),
   'action::node_make_unsticky_action' => array(
     'selected' => 0,
-    'use_queue' => 0,
     'skip_confirmation' => 0,
     'override_label' => 0,
     'label' => '',
+    'postpone_processing' => 0,
   ),
   'action::views_bulk_operations_modify_action' => array(
     'selected' => 0,
-    'use_queue' => 0,
     'skip_confirmation' => 0,
     'override_label' => 0,
     'label' => '',
@@ -132,6 +117,7 @@ $handler->display->display_options['fields']['views_bulk_operations']['vbo']['op
         '_all_' => '_all_',
       ),
     ),
+    'postpone_processing' => 0,
   ),
   'action::views_bulk_operations_argument_selector_action' => array(
     'selected' => 0,
@@ -144,31 +130,31 @@ $handler->display->display_options['fields']['views_bulk_operations']['vbo']['op
   ),
   'action::node_promote_action' => array(
     'selected' => 0,
-    'use_queue' => 0,
     'skip_confirmation' => 0,
     'override_label' => 0,
     'label' => '',
+    'postpone_processing' => 0,
   ),
   'action::node_publish_action' => array(
     'selected' => 0,
-    'use_queue' => 0,
     'skip_confirmation' => 0,
     'override_label' => 0,
     'label' => '',
+    'postpone_processing' => 0,
   ),
   'action::system_goto_action' => array(
     'selected' => 0,
-    'use_queue' => 0,
     'skip_confirmation' => 0,
     'override_label' => 0,
     'label' => '',
+    'postpone_processing' => 0,
   ),
   'action::node_unpromote_action' => array(
     'selected' => 0,
-    'use_queue' => 0,
     'skip_confirmation' => 0,
     'override_label' => 0,
     'label' => '',
+    'postpone_processing' => 0,
   ),
   'rules_component::tmgmt_node_ui_request_translation' => array(
     'selected' => 0,
@@ -184,38 +170,33 @@ $handler->display->display_options['fields']['views_bulk_operations']['vbo']['op
   ),
   'action::node_save_action' => array(
     'selected' => 0,
-    'use_queue' => 0,
     'skip_confirmation' => 0,
     'override_label' => 0,
     'label' => '',
+    'postpone_processing' => 0,
   ),
   'action::system_send_email_action' => array(
     'selected' => 0,
-    'use_queue' => 0,
     'skip_confirmation' => 0,
     'override_label' => 0,
     'label' => '',
+    'postpone_processing' => 0,
   ),
   'action::node_unpublish_action' => array(
     'selected' => 0,
-    'use_queue' => 0,
     'skip_confirmation' => 0,
     'override_label' => 0,
     'label' => '',
+    'postpone_processing' => 0,
   ),
   'action::node_unpublish_by_keyword_action' => array(
     'selected' => 0,
-    'use_queue' => 0,
     'skip_confirmation' => 0,
     'override_label' => 0,
     'label' => '',
+    'postpone_processing' => 0,
   ),
 );
-$handler->display->display_options['fields']['views_bulk_operations']['vbo']['enable_select_all_pages'] = 1;
-$handler->display->display_options['fields']['views_bulk_operations']['vbo']['display_type'] = '1';
-$handler->display->display_options['fields']['views_bulk_operations']['vbo']['display_result'] = 1;
-$handler->display->display_options['fields']['views_bulk_operations']['vbo']['merge_single_action'] = 0;
-$handler->display->display_options['fields']['views_bulk_operations']['vbo']['force_single'] = 0;
 /* Field: Title */
 $handler->display->display_options['fields']['title']['id'] = 'title';
 $handler->display->display_options['fields']['title']['table'] = 'node';
@@ -265,8 +246,6 @@ $handler->display->display_options['filters']['title']['expose']['operator_id']
 $handler->display->display_options['filters']['title']['expose']['label'] = 'Node title';
 $handler->display->display_options['filters']['title']['expose']['operator'] = 'title_op';
 $handler->display->display_options['filters']['title']['expose']['identifier'] = 'title';
-$handler->display->display_options['filters']['title']['expose']['required'] = 0;
-$handler->display->display_options['filters']['title']['expose']['multiple'] = FALSE;
 /* Filter criterion: Published */
 $handler->display->display_options['filters']['status']['id'] = 'status';
 $handler->display->display_options['filters']['status']['table'] = 'node';
@@ -280,17 +259,6 @@ $handler->display->display_options['filters']['status']['expose']['label'] = 'Pu
 $handler->display->display_options['filters']['status']['expose']['operator'] = 'status_op';
 $handler->display->display_options['filters']['status']['expose']['identifier'] = 'status';
 $handler->display->display_options['filters']['status']['expose']['required'] = TRUE;
-/* Filter criterion: Translatable types */
-$handler->display->display_options['filters']['tmgmt_translatable_types_1']['id'] = 'tmgmt_translatable_types_1';
-$handler->display->display_options['filters']['tmgmt_translatable_types_1']['table'] = 'node';
-$handler->display->display_options['filters']['tmgmt_translatable_types_1']['field'] = 'tmgmt_translatable_types';
-$handler->display->display_options['filters']['tmgmt_translatable_types_1']['ui_name'] = 'Translatable types';
-$handler->display->display_options['filters']['tmgmt_translatable_types_1']['group'] = 1;
-$handler->display->display_options['filters']['tmgmt_translatable_types_1']['exposed'] = TRUE;
-$handler->display->display_options['filters']['tmgmt_translatable_types_1']['expose']['operator_id'] = '';
-$handler->display->display_options['filters']['tmgmt_translatable_types_1']['expose']['label'] = 'Translatable types';
-$handler->display->display_options['filters']['tmgmt_translatable_types_1']['expose']['operator'] = 'tmgmt_translatable_types_1_op';
-$handler->display->display_options['filters']['tmgmt_translatable_types_1']['expose']['identifier'] = 'types';
 /* Filter criterion: Source translation */
 $handler->display->display_options['filters']['source_translation']['id'] = 'source_translation';
 $handler->display->display_options['filters']['source_translation']['table'] = 'node';
@@ -298,7 +266,7 @@ $handler->display->display_options['filters']['source_translation']['field'] = '
 $handler->display->display_options['filters']['source_translation']['ui_name'] = 'Source translation';
 $handler->display->display_options['filters']['source_translation']['operator'] = '1';
 $handler->display->display_options['filters']['source_translation']['group'] = 1;
-/* Filter criterion: Content translation: Language */
+/* Filter criterion: Content: Language */
 $handler->display->display_options['filters']['language']['id'] = 'language';
 $handler->display->display_options['filters']['language']['table'] = 'node';
 $handler->display->display_options['filters']['language']['field'] = 'language';
@@ -307,17 +275,29 @@ $handler->display->display_options['filters']['language']['value'] = array(
   'und' => 'und',
 );
 $handler->display->display_options['filters']['language']['group'] = 1;
-/* Filter criterion: Content translation: Language */
+/* Filter criterion: Content: Language */
 $handler->display->display_options['filters']['language_1']['id'] = 'language_1';
 $handler->display->display_options['filters']['language_1']['table'] = 'node';
 $handler->display->display_options['filters']['language_1']['field'] = 'language';
 $handler->display->display_options['filters']['language_1']['group'] = 1;
 $handler->display->display_options['filters']['language_1']['exposed'] = TRUE;
 $handler->display->display_options['filters']['language_1']['expose']['operator_id'] = 'language_1_op';
-$handler->display->display_options['filters']['language_1']['expose']['label'] = 'Source Language';
+$handler->display->display_options['filters']['language_1']['expose']['label'] = 'Source language';
 $handler->display->display_options['filters']['language_1']['expose']['operator'] = 'language_1_op';
 $handler->display->display_options['filters']['language_1']['expose']['identifier'] = 'language_1';
-$handler->display->display_options['filters']['language_1']['expose']['reduce'] = 0;
+/* Filter criterion: Content translation: Select translatable content types */
+$handler->display->display_options['filters']['tmgmt_translatable_types_exposed']['id'] = 'tmgmt_translatable_types_exposed';
+$handler->display->display_options['filters']['tmgmt_translatable_types_exposed']['table'] = 'node';
+$handler->display->display_options['filters']['tmgmt_translatable_types_exposed']['field'] = 'tmgmt_translatable_types_exposed';
+$handler->display->display_options['filters']['tmgmt_translatable_types_exposed']['exposed'] = TRUE;
+$handler->display->display_options['filters']['tmgmt_translatable_types_exposed']['expose']['operator_id'] = 'tmgmt_translatable_types_exposed_op';
+$handler->display->display_options['filters']['tmgmt_translatable_types_exposed']['expose']['label'] = 'Content type';
+$handler->display->display_options['filters']['tmgmt_translatable_types_exposed']['expose']['operator'] = 'tmgmt_translatable_types_exposed_op';
+$handler->display->display_options['filters']['tmgmt_translatable_types_exposed']['expose']['identifier'] = 'tmgmt_translatable_types_exposed';
+/* Filter criterion: Content translation: All translatable types */
+$handler->display->display_options['filters']['tmgmt_translatable_types']['id'] = 'tmgmt_translatable_types';
+$handler->display->display_options['filters']['tmgmt_translatable_types']['table'] = 'node';
+$handler->display->display_options['filters']['tmgmt_translatable_types']['field'] = 'tmgmt_translatable_types';
 
 /* Display: Page */
 $handler = $view->new_display('page', 'Page', 'page');
@@ -338,6 +318,10 @@ $translatables['tmgmt_node_source_overview'] = array(
   t('Items per page'),
   t('- All -'),
   t('Offset'),
+  t('« first'),
+  t('‹ previous'),
+  t('next ›'),
+  t('last »'),
   t('There are no nodes that match the specified filter criteria.'),
   t('User'),
   t('<!--views-bulk-operations-select-all-->'),
@@ -348,7 +332,7 @@ $translatables['tmgmt_node_source_overview'] = array(
   t('Updated date'),
   t('Node title'),
   t('Published'),
-  t('Translatable types'),
-  t('Source Language'),
+  t('Source language'),
+  t('Content type'),
   t('Page'),
 );