diff --git a/includes/tmgmt.entity.inc b/includes/tmgmt.entity.inc
index 2c0a2cb..1fbf3c1 100644
--- a/includes/tmgmt.entity.inc
+++ b/includes/tmgmt.entity.inc
@@ -1024,42 +1024,9 @@ class TMGMTJob extends Entity {
    * Overrides Entity::buildContent().
    */
   public function buildContent($view_mode = 'full', $langcode = NULL) {
-    $wrapper = entity_metadata_wrapper('tmgmt_job', $this);
-    $content['created'] = array(
-      '#type' => 'item',
-      '#title' => t('Created'),
-      '#markup' => format_date($wrapper->created->value()),
-    );
-    $content['changed'] = array(
-      '#type' => 'item',
-      '#title' => t('Last changed'),
-      '#markup' => format_date($wrapper->changed->value()),
-    );
-    $content['state'] = array(
-      '#type' => 'item',
-      '#title' => t('State'),
-      '#markup' => $wrapper->state->label(),
-    );
-    $content['word_count'] = array(
-      '#type' => 'item',
-      '#title' => t('Word count'),
-      '#markup' => $this->getWordCount(),
-    );
-    if (module_exists('views')) {
-      if ($view = views_get_view('tmgmt_ui_job_items')) {
-        $content['items'] = array(
-          '#type' => 'item',
-          '#title' => $view->get_title(),
-          '#markup' => $view->preview('block', array($this->tjid)),
-        );
-      }
-      if ($view = views_get_view('tmgmt_ui_job_messages')) {
-        $content['messages'] = array(
-          '#type' => 'item',
-          '#title' => $view->get_title(),
-          '#markup' => $view->preview('block', array($this->tjid)),
-        );
-      }
+    $content = array();
+    if (module_exists('tmgmt_ui')) {
+      $content = entity_ui_get_form('tmgmt_job', $this);
     }
     return entity_get_controller($this->entityType)->buildContent($this, $view_mode, $langcode, $content);
   }
diff --git a/sources/node/ui/tmgmt_node_ui.test b/sources/node/ui/tmgmt_node_ui.test
index f1e60f8..fd226ff 100644
--- a/sources/node/ui/tmgmt_node_ui.test
+++ b/sources/node/ui/tmgmt_node_ui.test
@@ -98,7 +98,6 @@ class TMGMTNodeSourceUITestCase extends TMGMTBaseTestCase {
     $this->assertNoLink(t('delete'));
     $this->assertText(t('From English to German'));
     $this->clickLink(t('view'));
-    $this->clickLink(t('Manage'));
     $this->assertResponse(200);
     $this->assertNoRaw(t('Submit to translator'));
 
diff --git a/tmgmt.info b/tmgmt.info
index 5ae96af..7b93b9c 100644
--- a/tmgmt.info
+++ b/tmgmt.info
@@ -5,6 +5,7 @@ core = 7.x
 
 dependencies[] = entity
 dependencies[] = locale
+dependencies[] = views
 
 files[] = includes/tmgmt.exception.inc
 files[] = includes/tmgmt.controller.inc
diff --git a/ui/includes/tmgmt_ui.controller.inc b/ui/includes/tmgmt_ui.controller.inc
index 771f778..1b3d5ba 100644
--- a/ui/includes/tmgmt_ui.controller.inc
+++ b/ui/includes/tmgmt_ui.controller.inc
@@ -189,23 +189,6 @@ class TMGMTJobUIController extends EntityDefaultUIController {
       'file' => $this->entityInfo['admin ui']['file'],
       'file path' => $this->entityInfo['admin ui']['file path'],
     );
-    $items[$this->path . '/' . $wildcard . '/view'] = array(
-      'title' => 'View',
-      'load arguments' => array($this->entityType),
-      'type' => MENU_DEFAULT_LOCAL_TASK,
-      'weight' => -10,
-    );
-    $items[$this->path . '/' . $wildcard . '/manage'] = array(
-      'title' => 'Manage',
-      'page callback' => 'entity_ui_get_form',
-      'page arguments' => array($this->entityType, $id_count),
-      'load arguments' => array($this->entityType),
-      'access callback' => 'entity_access',
-      'access arguments' => array('update', $this->entityType, $id_count),
-      'type' => MENU_LOCAL_TASK,
-      'file' => $this->entityInfo['admin ui']['file'],
-      'file path' => $this->entityInfo['admin ui']['file path'],
-    );
     $items[$this->path . '/' . $wildcard . '/cancel'] = array(
       'page callback' => 'drupal_get_form',
       'page arguments' => array($this->entityType . '_operation_form', $this->entityType, $id_count, $id_count + 1),
diff --git a/ui/includes/tmgmt_ui.pages.inc b/ui/includes/tmgmt_ui.pages.inc
index 1a692d7..32a5ef9 100644
--- a/ui/includes/tmgmt_ui.pages.inc
+++ b/ui/includes/tmgmt_ui.pages.inc
@@ -300,6 +300,13 @@ function tmgmt_job_form($form, &$form_state, TMGMTJob $job, $op = 'edit') {
       '#markup' => $view->preview('block', array($job->tjid)),
     );
   }
+
+  $content['word_count'] = array(
+    '#type' => 'item',
+    '#title' => t('Word count'),
+    '#markup' => $job->getWordCount(),
+  );
+
   $form['languages'] = array(
     '#type' => 'fieldset',
     '#title' => t('Languages'),
@@ -391,6 +398,15 @@ function tmgmt_job_form($form, &$form_state, TMGMTJob $job, $op = 'edit') {
   elseif (!empty($job->translator)) {
     $form['translator_wrapper']['info'] = tmgmt_ui_checkout_info($job);
   }
+
+  if ($view = views_get_view('tmgmt_ui_job_messages')) {
+    $form['messages'] = array(
+      '#type' => 'item',
+      '#title' => $view->get_title(),
+      '#markup' => $view->preview('block', array($job->tjid)),
+    );
+  }
+
   // Add the buttons and action links.
   $form['actions']['#type'] = 'actions';
   $form['actions']['submit'] = array(
diff --git a/ui/tmgmt_ui.module b/ui/tmgmt_ui.module
index bbe1f2c..4db468c 100644
--- a/ui/tmgmt_ui.module
+++ b/ui/tmgmt_ui.module
@@ -254,7 +254,7 @@ function tmgmt_ui_job_checkout_multiple(array $jobs) {
       }
 
       $uri = $job->uri();
-      $redirects[] = $uri['path'] . '/manage';
+      $redirects[] = $uri['path'];
     }
     else {
       // @todo this is dangerous because we don't catch request fails at all.
diff --git a/ui/tmgmt_ui.test b/ui/tmgmt_ui.test
index 7997048..35adb12 100644
--- a/ui/tmgmt_ui.test
+++ b/ui/tmgmt_ui.test
@@ -229,7 +229,7 @@ class TMGMTUITestCase extends TMGMTBaseTestCase {
     // settings, so a checkout is necessary.
     $redirects = tmgmt_ui_job_checkout_multiple(array($job));
     $uri = $job->uri();
-    $this->assertEqual($uri['path'] . '/manage', $redirects[0]);
+    $this->assertEqual($uri['path'], $redirects[0]);
     $this->assertTrue($job->isUnprocessed());
     $job->delete();
 
@@ -248,7 +248,7 @@ class TMGMTUITestCase extends TMGMTBaseTestCase {
     $job = $this->createJob('en', '');
     $redirects = tmgmt_ui_job_checkout_multiple(array($job));
     $uri = $job->uri();
-    $this->assertEqual($uri['path'] . '/manage', $redirects[0]);
+    $this->assertEqual($uri['path'], $redirects[0]);
     $this->assertTrue($job->isUnprocessed());
 
     // Create a second file translator. This should check
@@ -263,7 +263,7 @@ class TMGMTUITestCase extends TMGMTBaseTestCase {
 
     $redirects = tmgmt_ui_job_checkout_multiple(array($job));
     $uri = $job->uri();
-    $this->assertEqual($uri['path'] . '/manage', $redirects[0]);
+    $this->assertEqual($uri['path'], $redirects[0]);
     $this->assertTrue($job->isUnprocessed());
   }
 }
diff --git a/ui/views/tmgmt_ui_job_overview.view.inc b/ui/views/tmgmt_ui_job_overview.view.inc
index a92fbe9..092ef83 100644
--- a/ui/views/tmgmt_ui_job_overview.view.inc
+++ b/ui/views/tmgmt_ui_job_overview.view.inc
@@ -107,7 +107,7 @@ $handler->display->display_options['relationships']['translator']['table'] = 'tm
 $handler->display->display_options['relationships']['translator']['field'] = 'translator';
 $handler->display->display_options['relationships']['translator']['ui_name'] = 'Translator';
 $handler->display->display_options['relationships']['translator']['label'] = 'Translator';
-$handler->display->display_options['relationships']['translator']['required'] = TRUE;
+$handler->display->display_options['relationships']['translator']['required'] = 0;
 /* Field: Bulk operations */
 $handler->display->display_options['fields']['views_bulk_operations']['id'] = 'views_bulk_operations';
 $handler->display->display_options['fields']['views_bulk_operations']['table'] = 'tmgmt_job';
@@ -357,4 +357,4 @@ $translatables['tmgmt_ui_job_overview'] = array(
   t('Changed'),
   t('Operations'),
   t('Page'),
-);
\ No newline at end of file
+);
diff --git a/views/handlers/tmgmt_handler_field_tmgmt_job_operations.inc b/views/handlers/tmgmt_handler_field_tmgmt_job_operations.inc
index cc01dd2..0e7314d 100644
--- a/views/handlers/tmgmt_handler_field_tmgmt_job_operations.inc
+++ b/views/handlers/tmgmt_handler_field_tmgmt_job_operations.inc
@@ -15,15 +15,17 @@ class tmgmt_handler_field_tmgmt_job_operations extends views_handler_field_entit
     $element['#theme'] = 'links';
     $element['#attributes'] = array('class' => array('inline'));
     $uri = $job->uri();
-    $element['#links']['view'] = array(
-      'href' => $uri['path'],
-      'title' => t('view'),
-    );
     if ($job->isSubmittable() && entity_access('submit', 'tmgmt_job', $job)) {
-      $element['#links']['checkout'] = array(
-        'href' => 'admin/config/regional/tmgmt/jobs/' . $job->tjid . '/manage',
+      $element['#links']['submit'] = array(
+        'href' => $uri['path'],
         'query' => array('destination' => current_path()),
-        'title' => t('checkout'),
+        'title' => t('submit'),
+      );
+    }
+    else {
+      $element['#links']['manage'] = array(
+        'href' => $uri['path'],
+        'title' => t('manage'),
       );
     }
     if ($job->isCancelable() && entity_access('submit', 'tmgmt_job', $job)) {