diff --git a/translators/tmgmt_local/includes/tmgmt_local.entity.inc b/translators/tmgmt_local/includes/tmgmt_local.entity.inc
index ac23b65..a6701f8 100644
--- a/translators/tmgmt_local/includes/tmgmt_local.entity.inc
+++ b/translators/tmgmt_local/includes/tmgmt_local.entity.inc
@@ -86,14 +86,31 @@ class TMGMTLocalTask extends Entity {
    * Overrides Entity::defaultUri().
    */
   public function defaultUri() {
-    return array('path' => 'admin/config/regional/tmgmt/local-tasks/' . $this->tltid);
+    return array('path' => 'translate/' . $this->tltid);
   }
 
   /**
    * Overrides Entity::defaultLabel().
    */
   protected function defaultLabel() {
-    return t('Task for @job assigned to @translator', array('@job' => $this->getJob()->label(), '@translator' =>  entity_label('user', user_load($this->tuid))));
+    if (empty($this->tuid)) {
+      if (empty($this->title)) {
+        return t('Task for @job', array('@job' => $this->getJob()->label()));
+      }
+      else {
+        return $this->title;
+      }
+    }
+    else {
+      if (empty($this->title)) {
+        return t('Task for @job assigned to @translator', array('@job' => $this->getJob()->label(), '@translator' =>  entity_label('user', user_load($this->tuid))));
+      }
+      else {
+        return t('@title assigned to @translator', array('@title' => $this->title, '@translator' =>  entity_label('user', user_load($this->tuid))));
+      }
+    }
+
+
   }
 
   /**
@@ -146,6 +163,26 @@ class TMGMTLocalTask extends Entity {
   }
 
   /**
+   * Create a task item for this task and the given job item.
+   *
+   * @param TMGMTJobItem $job_item
+   *   The job item.
+   */
+  public function addTaskItem(TMGMTJobItem $job_item) {
+    // Save the task to get an id.
+    if (empty($this->tltid)) {
+      $this->save();
+    }
+
+    $local_task = entity_create('tmgmt_local_task_item', array(
+      'tltid' => $this->identifier(),
+      'tjiid' => $job_item->identifier(),
+    ));
+    $local_task->save();
+    return $local_task;
+  }
+
+  /**
    * Returns the status of the task. Can be one of the task status constants.
    *
    * @return int
@@ -331,3 +368,172 @@ class TMGMTLocalTask extends Entity {
   }
 
 }
+
+/**
+ * Entity class for the local task item entity.
+ *
+ * @ingroup tmgmt_local_task
+ */
+class TMGMTLocalTaskItem extends Entity {
+
+  /**
+   * Translation local task item identifier.
+   *
+   * @var int
+   */
+  public $tltiid;
+
+  /**
+   * The task identifier.
+   *
+   * @var int
+   */
+  public $tltid;
+
+  /**
+   * Translation job item.
+   *
+   * @var int
+   */
+  public $tjiid;
+
+  /**
+   * Current status of the task.
+   *
+   * @var int
+   */
+  public $status;
+
+  /**
+   * Translated data and data item status.
+   *
+   * @var array
+   */
+  public $data = array();
+
+  /**
+   * Overrides Entity::__construct().
+   */
+  public function __construct(array $values = array(), $entity_type = 'tmgmt_local_task_item') {
+    parent::__construct($values, $entity_type);
+  }
+
+  /*
+   * Overrides Entity::defaultUri().
+   */
+  public function defaultUri() {
+    return array('path' => 'translate/' . $this->tltid . '/item/' . $this->tltiid);
+  }
+
+  /**
+   * Overrides Entity::defaultLabel().
+   */
+  protected function defaultLabel() {
+    if ($job_item = $this->getJobItem()) {
+      return $job_item->label();
+    }
+    return t('Missing job item');
+  }
+
+  /**
+   * Returns the translation task.
+   *
+   * @return TMGMTLocalTask
+   */
+  public function getTask() {
+    return entity_load_single('tmgmt_local_task', $this->tltid);
+  }
+
+  /**
+   * Returns the translation job item.
+   *
+   * @return TMGMTJobItem
+   */
+  public function getJobItem() {
+    return entity_load_single('tmgmt_job_item', $this->tjiid);
+  }
+
+  /**
+   * Overrides Entity::buildContent().
+   */
+  public function buildContent($view_mode = 'full', $langcode = NULL) {
+    $content = drupal_get_form('tmgmt_local_translation_form', $this);
+    return entity_get_controller($this->entityType)->buildContent($this, $view_mode, $langcode, $content);
+  }
+
+  public function isUntranslated() {
+    return $this->status == TMGMT_LOCAL_TASK_ITEM_STATUS_UNTRANSLATED;
+  }
+
+  /**
+   * Sets the task item status to translated.
+   */
+  public function translated() {
+    $this->status = TMGMT_LOCAL_TASK_ITEM_STATUS_TRANSLATED;
+  }
+
+  /**
+   * Sets the task item status to completed.
+   */
+  public function completed() {
+    $this->status = TMGMT_LOCAL_TASK_ITEM_STATUS_COMPLETED;
+  }
+
+  /**
+   * Updates the values for a specific substructure in the data array.
+   *
+   * The values are either set or updated but never deleted.
+   *
+   * @param $key
+   *   Key pointing to the item the values should be applied.
+   *   The key can be either be an array containing the keys of a nested array
+   *   hierarchy path or a string with '][' or '|' as delimiter.
+   * @param $values
+   *   Nested array of values to set.
+   */
+  public function updateData($key, $values = array()) {
+    foreach ($values as $index => $value) {
+      // In order to preserve existing values, we can not aplly the values array
+      // at once. We need to apply each containing value on its own.
+      // If $value is an array we need to advance the hierarchy level.
+      if (is_array($value)) {
+        $this->updateData(array_merge(tmgmt_ensure_keys_array($key), array($index)), $value);
+      }
+      // Apply the value.
+      else {
+        drupal_array_set_nested_value($this->data, array_merge(tmgmt_ensure_keys_array($key), array($index)), $value);
+      }
+    }
+  }
+
+  /**
+   * Array of translations.
+   *
+   * The structure is similar to the form API in the way that it is a possibly
+   * nested array with the following properties whose presence indicate that the
+   * current element is a text that might need to be translated.
+   *
+   * - #text: The translated text of the corresponding entry in the job item.
+   * - #status: The status of the translation.
+   *
+   * The key can be an alphanumeric string.
+   *
+   * @param array $key
+   *   If present, only the subarray identified by key is returned.
+   * @param string $index
+   *   Optional index of an attribute below $key.
+   *
+   * @return array
+   *   A structured data array.
+   */
+  public function getData(array $key = array(), $index = null) {
+    if (empty($key)) {
+      return $this->data;
+    }
+    if ($index) {
+      $key = array_merge($key, array($index));
+    }
+    return drupal_array_get_nested_value($this->data, $key);
+  }
+
+}
diff --git a/translators/tmgmt_local/includes/tmgmt_local.info.inc b/translators/tmgmt_local/includes/tmgmt_local.info.inc
index 78eed8e..fef56ac 100644
--- a/translators/tmgmt_local/includes/tmgmt_local.info.inc
+++ b/translators/tmgmt_local/includes/tmgmt_local.info.inc
@@ -62,3 +62,30 @@ class TMGMTLocalTaskMetadataController extends EntityDefaultMetadataController {
   }
 
 }
+
+
+/**
+ * Metadata controller for the local task entity.
+ */
+class TMGMTLocalTaskItemMetadataController extends EntityDefaultMetadataController {
+
+  /**
+   * Overrides EntityDefaultMetadataController::entityPropertyInfo().
+   */
+  public function entityPropertyInfo() {
+    $info = parent::entityPropertyInfo();
+    $properties = &$info[$this->type]['properties'];
+
+    // Add the options list for the defined status constants.
+    $properties['status']['options list'] = 'tmgmt_local_task_item_statuses';
+
+    // Link the job property to the corresponding job entity.
+    $properties['tjiid']['type'] = 'tmgmt_job_item';
+
+    // Link the author property to the corresponding user entity.
+    $properties['tltid']['type'] = 'tmgmt_local_task';
+
+    return $info;
+  }
+
+}
diff --git a/translators/tmgmt_local/includes/tmgmt_local.pages.inc b/translators/tmgmt_local/includes/tmgmt_local.pages.inc
index 8a681e0..310fff4 100644
--- a/translators/tmgmt_local/includes/tmgmt_local.pages.inc
+++ b/translators/tmgmt_local/includes/tmgmt_local.pages.inc
@@ -34,6 +34,7 @@ function tmgmt_local_task_form($form, &$form_state, TMGMTLocalTask $task, $op =
     '#type' => 'textfield',
     '#title' => t('Title'),
     '#default_value' => $task->title,
+    '#access' => user_access('administer tmgmt') || user_access('administer translation tasks'),
   );
 
   $form['status'] = array(
@@ -41,6 +42,7 @@ function tmgmt_local_task_form($form, &$form_state, TMGMTLocalTask $task, $op =
     '#title' => t('Status'),
     '#options' => tmgmt_local_task_statuses(),
     '#default_value' => $wrapper->status->value(),
+    '#access' => user_access('administer tmgmt') || user_access('administer translation tasks'),
   );
 
   $translators = tmgmt_local_translators($task->getJob()->source_language, $task->getJob()->target_language);
@@ -50,10 +52,24 @@ function tmgmt_local_task_form($form, &$form_state, TMGMTLocalTask $task, $op =
     '#options' => $translators,
     '#empty_option' => t('- Select user -'),
     '#default_value' => $task->tuid,
+    '#access' => user_access('administer tmgmt') || user_access('administer translation tasks'),
   );
 
+  if ($view = views_get_view('tmgmt_local_task_items')) {
+    $form['items'] = array(
+      '#type' => 'item',
+      '#title' => $view->get_title(),
+      '#prefix' => '<div class="tmgmt-local-task-items">',
+      '#markup' => $view->preview('block', $task->tltid),
+      '#attributes' => array('class' => array('tmgmt-local-task-items')),
+      '#suffix' => '</div>',
+      '#weight' => 10,
+    );
+  }
+
   // Add the buttons and action links.
   $form['actions']['#type'] = 'actions';
+  $form['actions']['#access'] = user_access('administer tmgmt') || user_access('administer translation tasks');
   $form['actions']['submit'] = array(
     '#type' => 'submit',
     '#value' => t('Save task'),
@@ -63,7 +79,7 @@ function tmgmt_local_task_form($form, &$form_state, TMGMTLocalTask $task, $op =
     $form['actions']['delete'] = array(
       '#type' => 'submit',
       '#value' => t('Delete'),
-      '#redirect' => 'admin/config/regional/tmgmt/local-tasks/' . $task->tltid . '/delete',
+      '#redirect' => 'translate/' . $task->tltid . '/delete',
       // Don't run validations, so the user can always delete the job.
       '#limit_validation_errors' => array(),
     );
@@ -77,9 +93,29 @@ function tmgmt_local_task_form($form, &$form_state, TMGMTLocalTask $task, $op =
  */
 function tmgmt_local_task_form_submit($form, &$form_state) {
   $task = entity_ui_form_submit_build_entity($form, $form_state);
+  // If the task isn't assigned to anyone but doesn't have the unassigned status
+  // update it.
+  if ($task->tuid == 0 && !$task->isUnassigned()) {
+    $task->unassign();
+  }
   $task->save();
 }
 
+
+
+/**
+ * Simple page callback for viewing a task.
+ *
+ * @param TMGMTLocalTaskItem $item
+ *   The viewed task item
+ *
+ * @return array
+ *   A renderable array.
+ */
+function tmgmt_local_task_item_view(TMGMTLocalTaskItem $item) {
+  return entity_view($item->entityType(), array($item), 'full', NULL, TRUE);
+}
+
 /**
  * Assign task to current user.
  *
@@ -94,15 +130,18 @@ function tmgmt_local_translation_assign_to_me(TMGMTLocalTask $task) {
 /**
  * Form callback for translating a job item.
  */
-function tmgmt_local_translation_form($form, &$form_state, TMGMTLocalTask $task, TMGMTJobItem $item) {
-  $form_state['task'] = $task;
-  $form_state['item'] = $item;
+function tmgmt_local_translation_form($form, &$form_state, TMGMTLocalTaskItem $task_item) {
+  $form_state['task'] = $task_item->getTask();
+  $form_state['task_item'] = $task_item;
+  $form_state['job_item'] = $job_item = $task_item->getJobItem();
 
-  if ($item->getJob()->getSetting('job_comment')) {
+  $job = $job_item->getJob();
+
+  if ($job->getSetting('job_comment')) {
     $form['job_comment'] = array(
       '#type' => 'item',
       '#title' => t('Job comment'),
-      '#markup' => $item->getJob()->getSetting('job_comment'),
+      '#markup' => $job->getSetting('job_comment'),
     );
   }
 
@@ -111,7 +150,7 @@ function tmgmt_local_translation_form($form, &$form_state, TMGMTLocalTask $task,
   );
 
   // Build the translation form.
-  $data = $item->getData();
+  $data = $job_item->getData();
 
   // Need to keep the first hierarchy. So flatten must take place inside
   // of the foreach loop.
@@ -119,7 +158,7 @@ function tmgmt_local_translation_form($form, &$form_state, TMGMTLocalTask $task,
   // Reverse the order to get the correct order.
   foreach (array_reverse(element_children($data)) as $key) {
     $flattened = tmgmt_flatten_data($data[$key], $key);
-    $form['translation'][$key] = tmgmt_local_translation_form_element($flattened, $item, $zebra);
+    $form['translation'][$key] = tmgmt_local_translation_form_element($flattened, $task_item, $zebra);
   }
 
   // Add the form actions as well.
@@ -145,11 +184,6 @@ function tmgmt_local_translation_form($form, &$form_state, TMGMTLocalTask $task,
  * Verify that all items are translated.
  */
 function tmgmt_local_translation_form_save_as_completed_validate($form, &$form_state) {
-  /**
-   * @var TMGMTJobItem $item.
-   */
-  $item = $form_state['item'];
-
   // Loop over all data items and verify that there is a translation in there.
   foreach ($form_state['values'] as $key => $value) {
     if (is_array($value) && isset($value['translation'])) {
@@ -172,16 +206,24 @@ function tmgmt_local_translation_form_save_as_completed_submit($form, &$form_sta
   $task = $form_state['task'];
 
   /**
-   * @var TMGMTJobItem $item.
+   * @var TMGMTLocalTaskItem $task_item.
+   */
+  $task_item = $form_state['task_item'];
+  $task_item->translated();
+  $task_item->save();
+
+  /**
+   * @var TMGMTJobItem $job_item.
    */
-  $item = $form_state['item'];
+  $job_item = $form_state['job_item'];
+
+  // Add the translations to the job item.
+  $job_item->addTranslatedData($task_item->getData());
 
-  // Set the job item to 'needs review' and task to finised states.
-  $item->needsReview();
   // Mark the task as completed if all assigned job items are at needs done.
   $all_done = TRUE;
-  foreach ($task->getItems() as $task_item) {
-    if ($task_item->isActive()) {
+  foreach ($job_item->getJob()->getItems() as $item) {
+    if ($item->isActive()) {
       $all_done = FALSE;
       break;
     }
@@ -202,27 +244,25 @@ function tmgmt_local_translation_form_save_as_completed_submit($form, &$form_sta
  */
 function tmgmt_local_translation_form_save_submit($form, &$form_state) {
   /**
-   * @var TMGMTJobItem $item.
+   * @var TMGMTTaskItem $task_item.
    */
-  $item = $form_state['item'];
+  $task_item = $form_state['task_item'];
 
-  // Write the translated data into the job item.
+  // Write the translated data into the task item.
   $values = $form_state['values'];
   foreach ($values as $key => $value) {
     if (isset($value['translation'])) {
-      $update['#translation'] = array(
-        '#text' => $value['translation'],
-      );
-      $item->updateData($key, $update);
+      $update['#text'] = $value['translation'];
+      $task_item->updateData($key, $update);
     }
   }
-  $item->save();
+  $task_item->save();
 }
 
 /**
  * Builds a translation form element.
  */
-function tmgmt_local_translation_form_element($data, TMGMTJobItem $item, &$zebra) {
+function tmgmt_local_translation_form_element($data, TMGMTLocalTaskItem $item, &$zebra) {
   static $flip = array(
     'even' => 'odd',
     'odd' => 'even',
@@ -230,7 +270,7 @@ function tmgmt_local_translation_form_element($data, TMGMTJobItem $item, &$zebra
 
   $form = array();
 
-  $job = $item->getJob();
+  $job = $item->getJobItem()->getJob();
   $language_list = language_list();
 
   foreach (element_children($data) as $key) {
@@ -259,14 +299,15 @@ function tmgmt_local_translation_form_element($data, TMGMTJobItem $item, &$zebra
       $form[$target_key]['translation'] = array(
         '#type' => 'textarea',
         '#title' => $target_language->name,
-        '#default_value' => isset($data[$key]['#translation']['#text']) ? $data[$key]['#translation']['#text'] : '',
+        '#default_value' => $item->getData(tmgmt_ensure_keys_array($key), '#text'),
         //'#required' => TRUE,
       );
 
       $form[$target_key]['actions'] = array(
         '#type' => 'container',
       );
-      $completed = !empty($data[$key]['#status']) && $data[$key]['#status'] == TMGMT_DATA_ITEM_STATE_TRANSLATED;
+      $status = $item->getData(tmgmt_ensure_keys_array($key), '#status');
+      $completed = $status == TMGMT_DATA_ITEM_STATE_TRANSLATED;
       if ($completed) {
         $form[$target_key]['actions']['reject-' . $target_key] = array(
           '#type' => 'submit',
@@ -312,9 +353,9 @@ function tmgmt_local_translation_form_update_state_submit($form, &$form_state) {
   $values = $form_state['values'];
 
   /**
-   * @var TMGMTJobItem $item.
+   * @var TMGMTLocalTaskItem $item.
    */
-  $item = $form_state['item'];
+  $item = $form_state['task_item'];
 
   $action = $form_state['triggering_element']['#tmgmt_local_action'];
   $key = $form_state['triggering_element']['#tmgmt_local_key'];
@@ -322,10 +363,7 @@ function tmgmt_local_translation_form_update_state_submit($form, &$form_state) {
   // Write the translated data into the job item.
   if (isset($values[$key]) && is_array($values[$key]) && isset($values[$key]['translation'])) {
     $update['#status'] = $action == 'finish' ? TMGMT_DATA_ITEM_STATE_TRANSLATED : TMGMT_DATA_ITEM_STATE_PENDING;
-    $update['#translation'] = array(
-      '#text' => $values[$key]['translation'],
-    );
-
+    $update['#text'] = $values[$key]['translation'];
     $item->updateData($key, $update);
     $item->save();
 
@@ -342,7 +380,7 @@ function tmgmt_local_translation_form_update_state_ajax($form, &$form_state) {
   $commands = array();
   $render_data = drupal_array_get_nested_value($form, $key);
   $commands[] = ajax_command_replace(NULL, drupal_render($render_data));
-  tmgmt_ui_write_request_messages($form_state['item']->getJob());
+  tmgmt_ui_write_request_messages($form_state['job_item']->getJob());
   $commands[] = ajax_command_html('#tmgmt-status-messages-' . strtolower($render_data['#parent_label'][0]), theme('status_messages'));
   return array('#type' => 'ajax', '#commands' => $commands);
 }
diff --git a/translators/tmgmt_local/includes/tmgmt_local.plugin.inc b/translators/tmgmt_local/includes/tmgmt_local.plugin.inc
index 2968a68..4c66497 100644
--- a/translators/tmgmt_local/includes/tmgmt_local.plugin.inc
+++ b/translators/tmgmt_local/includes/tmgmt_local.plugin.inc
@@ -29,6 +29,11 @@ class TMGMTLocalTranslatorPluginController extends TMGMTDefaultTranslatorPluginC
     }
     $local_task->save();
 
+    // Create task items.
+    foreach ($job->getItems() as $item) {
+      $local_task->addTaskItem($item);
+    }
+
     // The translation job has been successfully submitted.
     $job->submitted();
   }
diff --git a/translators/tmgmt_local/includes/tmgmt_local_ui.controller.inc b/translators/tmgmt_local/includes/tmgmt_local_ui.controller.inc
index 584555a..d22c790 100644
--- a/translators/tmgmt_local/includes/tmgmt_local_ui.controller.inc
+++ b/translators/tmgmt_local/includes/tmgmt_local_ui.controller.inc
@@ -30,6 +30,14 @@ class TMGMTLocalTaskUIController extends EntityDefaultUIController {
       'access arguments' => array('delete', $this->entityType, $id_count),
       'type' => MENU_CALLBACK,
     );
+    $items[$this->path . '/' . $wildcard . '/unassign'] = array(
+      'page callback' => 'drupal_get_form',
+      'page arguments' => array($this->entityType . '_operation_form', $this->entityType, $id_count, $id_count + 1),
+      'load arguments' => array($this->entityType),
+      'access callback' => 'entity_access',
+      'access arguments' => array('unassign', $this->entityType, $id_count),
+      'type' => MENU_CALLBACK,
+    );
     return $items;
   }
 
@@ -41,6 +49,9 @@ class TMGMTLocalTaskUIController extends EntityDefaultUIController {
       case 'delete':
         $confirm_question = t('Are you sure you want to delete the translation task %label?', array('%label' => $entity->label()));
         return confirm_form($form, $confirm_question, $this->path);
+      case 'unassign':
+        $confirm_question = t('Are you sure you want to unassign from the translation task %label?', array('%label' => $entity->label()));
+        return confirm_form($form, $confirm_question, $this->path);
     }
     drupal_not_found();
     exit;
@@ -54,8 +65,38 @@ class TMGMTLocalTaskUIController extends EntityDefaultUIController {
       case 'delete':
         $entity->delete();
         return t('Deleted the translation local task %label.', array('%label' => $entity->label()));
+      case 'unassign':
+        $entity->unassign();
+        $entity->save();
+        return t('Unassigned from translation local task %label.', array('%label' => $entity->label()));
     }
     return FALSE;
   }
 
 }
+
+/**
+ * Entity UI controller for the local task item entity.
+ */
+class TMGMTLocalTaskItemUIController extends EntityDefaultUIController {
+
+  /**
+   * Overrides EntityDefaultUIController::hook_menu().
+   */
+  public function hook_menu() {
+    $id_count = count(explode('/', $this->path));
+    $items[$this->path . '/%tmgmt_local_task/item/%tmgmt_local_task_item'] = array(
+      'title callback' => 'entity_label',
+      'title arguments' => array($this->entityType, $id_count + 2),
+      'page callback' => 'tmgmt_local_task_item_view',
+      'page arguments' => array($id_count + 2),
+      'load arguments' => array($this->entityType),
+      'access callback' => 'entity_access',
+      'access arguments' => array('view', $this->entityType, $id_count + 2),
+      'file' => 'tmgmt_local.pages.inc',
+      'file path' => drupal_get_path('module', 'tmgmt_local') . '/includes',
+    );
+    return $items;
+  }
+
+}
diff --git a/translators/tmgmt_local/tmgmt_local.info b/translators/tmgmt_local/tmgmt_local.info
index 1a4f2a4..29da59c 100644
--- a/translators/tmgmt_local/tmgmt_local.info
+++ b/translators/tmgmt_local/tmgmt_local.info
@@ -14,14 +14,10 @@ files[] = tmgmt_local.test
 
 ; Views integration and handlers
 files[] = views/tmgmt_local.views.inc
-files[] = views/handlers/tmgmt_local_task_handler_field_view.inc
-files[] = views/handlers/tmgmt_local_task_handler_field_assign.inc
-files[] = views/handlers/tmgmt_local_task_handler_field_assign_to_me.inc
 files[] = views/handlers/tmgmt_local_task_handler_field_job_item_count.inc
 files[] = views/handlers/tmgmt_local_task_handler_field_loop_count.inc
 files[] = views/handlers/tmgmt_local_task_handler_field_operations.inc
 files[] = views/handlers/tmgmt_local_task_handler_field_progress.inc
-files[] = views/handlers/tmgmt_local_task_handler_field_translate.inc
-files[] = views/handlers/tmgmt_local_task_handler_field_translate_task_item.inc
+files[] = views/handlers/tmgmt_local_task_handler_field_item_operations.inc
 files[] = views/handlers/tmgmt_local_task_handler_field_wordcount.inc
 files[] = views/handlers/tmgmt_local_task_handler_filter_eligible.inc
diff --git a/translators/tmgmt_local/tmgmt_local.install b/translators/tmgmt_local/tmgmt_local.install
index 45a0106..36ade11 100644
--- a/translators/tmgmt_local/tmgmt_local.install
+++ b/translators/tmgmt_local/tmgmt_local.install
@@ -84,5 +84,172 @@ function tmgmt_local_schema() {
     ),
   );
 
+  $schema['tmgmt_local_task_item'] = array(
+    'description' => 'A tmgmt local task item contains additional workflow data for a job item.',
+    'fields' => array(
+      'tltiid' => array(
+        'description' => 'The identifier of the task item.',
+        'type' => 'serial',
+        'not null' => TRUE,
+      ),
+      'tltid' => array(
+        'description' => 'Translation job task {tmgmt_local_task}.tltid that belongs to task.',
+        'type' => 'int',
+        'not null' => TRUE,
+      ),
+      'tjiid' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'description' => "Translation job item {tmgmt_job_item}.tjiid that belongs to task.",
+      ),
+      'status' => array(
+        'description' => 'The status of the task.',
+        'type' => 'int',
+        'not null' => TRUE,
+      ),
+      'data' => array(
+        'description' => 'Stores translations and translation statuses',
+        'type' => 'text',
+        'not null' => TRUE,
+        'size' => 'big',
+        'serialize' => TRUE,
+      ),
+    ),
+    'primary key' => array('tltiid'),
+    'indexes' => array(
+      'tltid' => array('tltid'),
+    ),
+    'foreign keys' => array(
+      'task' => array(
+        'table' => 'tmgmt_local_task',
+        'columns' => array('tltid' => 'tltid'),
+      ),
+      'job_item' => array(
+        'table' => 'tmgmt_job_item',
+        'columns' => array('tjiid' => 'tjiid'),
+      ),
+    ),
+  );
+
   return $schema;
 }
+
+/**
+ * Adds the {tmgmt_local_task_item} table.
+ */
+function tmgmt_local_update_7000() {
+  $schema = array(
+    'description' => 'A tmgmt local task item contains additional workflow data for a job item.',
+    'fields' => array(
+      'tltiid' => array(
+        'description' => 'The identifier of the task item.',
+        'type' => 'serial',
+        'not null' => TRUE,
+      ),
+      'tltid' => array(
+        'description' => 'Translation job task {tmgmt_local_task}.tltid that belongs to task.',
+        'type' => 'int',
+        'not null' => TRUE,
+      ),
+      'tjiid' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'description' => "Translation job item {tmgmt_job_item}.tjiid that belongs to task.",
+      ),
+      'status' => array(
+        'description' => 'The status of the task.',
+        'type' => 'int',
+        'not null' => TRUE,
+      ),
+      'data' => array(
+        'description' => 'Stores translations and translation statuses',
+        'type' => 'text',
+        'not null' => TRUE,
+        'size' => 'big',
+        'serialize' => TRUE,
+      ),
+    ),
+    'primary key' => array('tltiid'),
+    'indexes' => array(
+      'tltid' => array('tltid'),
+    ),
+    'foreign keys' => array(
+      'task' => array(
+        'table' => 'tmgmt_local_task',
+        'columns' => array('tltid' => 'tltid'),
+      ),
+      'job_item' => array(
+        'table' => 'tmgmt_job_item',
+        'columns' => array('tjiid' => 'tjiid'),
+      ),
+    ),
+  );
+  db_create_table('tmgmt_local_task_item', $schema);
+}
+
+/**
+ * Create local task items.
+ */
+function tmgmt_local_update_7001() {
+  $result = db_query('SELECT lt.tltid, ji.tjiid, ji.state, ji.data from {tmgmt_local_task} lt INNER JOIN {tmgmt_job} j ON j.tjid = lt.tjid INNER JOIN {tmgmt_job_item} ji ON ji.tjid = j.tjid');
+  $insert = db_insert('tmgmt_local_task_item')
+    ->fields(array('tltid', 'tjiid', 'status', 'data'));
+  foreach ($result as $row) {
+    switch ($row->state) {
+      case 2:
+        // Job item state needs review is task item status translated.
+        $status = 1;
+        break;
+      case 3:
+        // Job item state accepted is task item status completed.
+        $status = 3;
+        break;
+      case 1:
+      default:
+        // Job item state active is task item status untranslated.
+        $status = 0;
+        break;
+    }
+    $translation = (array)_tmgmt_local_translated_data_7001(unserialize($row->data));
+    $insert->values(array(
+      'tltid' => $row->tltid,
+      'tjiid' => $row->tjiid,
+      'status' => $status,
+      'data' => serialize($translation),
+    ));
+  }
+  $insert->execute();
+}
+
+/**
+ * Data parsing helper function for tmgmt_local_update_7001().
+ *
+ * Copies #translation texts from the source data array to the translation
+ * data array.
+ *
+ * @param array $source
+ *   The original source data array of the job item.
+ *
+ * @return array
+ *   The filled translation data array.
+ */
+function _tmgmt_local_translated_data_7001($source) {
+  if (!empty($source['#translation']['#text'])) {
+    $translation['#text'] = $source['#translation']['#text'];
+    if ((!empty($source['#status']))) {
+      $translation['#status'] = $source['#status'];
+    }
+    return $translation;
+  }
+  else {
+    $translation = array();
+    foreach (element_children($source) as $key) {
+      if ($return = _tmgmt_local_translated_data_7001($source[$key])) {
+        $translation[$key] = $return;
+      }
+    }
+    if (!empty($translation)) {
+      return $translation;
+    }
+  }
+}
diff --git a/translators/tmgmt_local/tmgmt_local.module b/translators/tmgmt_local/tmgmt_local.module
index 86e2b62..9821059 100644
--- a/translators/tmgmt_local/tmgmt_local.module
+++ b/translators/tmgmt_local/tmgmt_local.module
@@ -51,11 +51,30 @@ define('TMGMT_LOCAL_TASK_STATUS_REJECTED', 3);
 
 /**
  * Translation task is closed.
- *
  */
 define('TMGMT_LOCAL_TASK_STATUS_CLOSED', 4);
 
 /**
+ * Translation task item is untranslated.
+ */
+define('TMGMT_LOCAL_TASK_ITEM_STATUS_UNTRANSLATED', 0);
+
+/**
+ * Translation task item is translated and pending review of the job item.
+ */
+define('TMGMT_LOCAL_TASK_ITEM_STATUS_TRANSLATED', 1);
+
+/**
+ * Translation job item has been rejected and the task needs to be updated.
+ */
+define('TMGMT_LOCAL_TASK_ITEM_STATUS_REJECTED', 2);
+
+/**
+ * The translation task item has been completed and closed.
+ */
+define('TMGMT_LOCAL_TASK_ITEM_STATUS_COMPLETED', 3);
+
+/**
  * @} End of "tmgmt_local_task".
  */
 
@@ -66,7 +85,7 @@ function tmgmt_local_entity_info() {
   $info = array(
     'tmgmt_local_task' => array(
       'label' => t('Translation Task'),
-      'module' => 'tmgmt_local_task',
+      'module' => 'tmgmt_local',
       'entity class' => 'TMGMTLocalTask',
       'controller class' => 'TMGMTLocalTaskController',
       'metadata controller class' => 'TMGMTLocalTaskMetadataController',
@@ -80,7 +99,26 @@ function tmgmt_local_entity_info() {
       ),
       'admin ui' => array(
         'controller class' => 'TMGMTLocalTaskUIController',
-        'path' => 'admin/config/regional/tmgmt/local-tasks',
+        'path' => 'translate',
+      ),
+    ),
+    'tmgmt_local_task_item' => array(
+      'label' => t('Translation Task Item'),
+      'module' => 'tmgmt_local',
+      'entity class' => 'TMGMTLocalTaskItem',
+      'controller class' => 'EntityAPIController',
+      'metadata controller class' => 'TMGMTLocalTaskItemMetadataController',
+      'views controller class' => 'TMGMTLocalTaskItemViewsController',
+      'base table' => 'tmgmt_local_task_item',
+      'uri callback' => 'entity_class_uri',
+      'label callback' => 'entity_class_label',
+      'access callback' => 'tmgmt_local_task_item_access',
+      'entity keys' => array(
+        'id' => 'tltiid',
+      ),
+      'admin ui' => array(
+        'controller class' => 'TMGMTLocalTaskItemUIController',
+        'path' => 'translate',
       ),
     ),
   );
@@ -139,15 +177,6 @@ function tmgmt_local_menu() {
     'file' => 'includes/tmgmt_local.pages.inc',
     'type' => MENU_CALLBACK,
   );
-  $items['translate/%tmgmt_local_task/item/%tmgmt_job_item'] = array(
-    'title' => 'Translate Task Item',
-    'description' => 'Translate task item.',
-    'page callback' => 'drupal_get_form',
-    'page arguments' => array('tmgmt_local_translation_form', 1, 3),
-    'access callback' => 'tmgmt_local_translation_access',
-    'access arguments' => array(1),
-    'file' => 'includes/tmgmt_local.pages.inc',
-  );
 
   return $items;
 }
@@ -380,6 +409,20 @@ function tmgmt_local_task_load_multiple(array $tltids = array(), $conditions = a
 }
 
 /**
+ * Loads a local translation task items entity.
+ */
+function tmgmt_local_task_item_load($tltiid) {
+  return entity_load_single('tmgmt_local_task_item', $tltiid);
+}
+
+/**
+ * Loads local translation task items entity.
+ */
+function tmgmt_local_task_item_load_multiple(array $tltiids = array(), $conditions = array()) {
+  return entity_load('tmgmt_local_task_item', $tltiids, $conditions);
+}
+
+/**
  * Creates a translation task entity.
  *
  * @param $values
@@ -423,13 +466,43 @@ function tmgmt_local_task_access($op, $task = NULL, $account = NULL) {
     return TRUE;
   }
 
+  if (!$account) {
+    global $user;
+    $account = $user;
+  }
+
   // @todo - probably need refinement when we introduce more module permissions.
   switch ($op) {
     case 'view':
     case 'update':
       return user_access('provide translation services', $account);
       break;
+    case 'unassign':
+      return !empty($task->tuid) && $task->tuid == $account->uid && user_access('provide translation services', $account);
+  }
+}
+
+/**
+ * Access callback for the local task item entity.
+ *
+ * @param $op
+ *   The operation being performed.
+ * @param $item
+ *   (Optional) A TMGMTLocalTaskItem entity to check access for. If no entity is
+ *   given, it will be determined whether access is allowed for all entities.
+ * @param $account
+ *   (Optional) The user to check for. Leave it to NULL to check for the global
+ *   user.
+ *
+ * @return boolean
+ *   TRUE if access is allowed, FALSE otherwise.
+ */
+function tmgmt_local_task_item_access($op, TMGMTLocalTaskItem $item = NULL, $account = NULL) {
+  $task = NULL;
+  if ($item) {
+    $task = $item->getTask();
   }
+  return entity_access($op, 'tmgmt_local_task', $task, $account);
 }
 
 /**
@@ -519,6 +592,21 @@ function tmgmt_local_task_statuses() {
 }
 
 /**
+ * Retrieve a labeled list of all available statuses for task items.
+ *
+ * @return array
+ *   A list of all available statuses.
+ */
+function tmgmt_local_task_item_statuses() {
+  return $statuses = array(
+    TMGMT_LOCAL_TASK_ITEM_STATUS_UNTRANSLATED => t('Untranslated'),
+    TMGMT_LOCAL_TASK_ITEM_STATUS_TRANSLATED => t('Translated'),
+    TMGMT_LOCAL_TASK_ITEM_STATUS_REJECTED => t('Rejected'),
+    TMGMT_LOCAL_TASK_ITEM_STATUS_COMPLETED => t('Completed'),
+  );
+}
+
+/**
  * Gets all involved language pairs for given tasks.
  *
  * @param array $tasks
@@ -621,3 +709,17 @@ function tmgmt_local_get_translators_for_tasks($tasks) {
 /**
  * @} End of "addtogroup tmgmt_local_task".
  */
+
+/**
+ * Implements hook_tmgmt_job_item_update().
+ *
+ * @todo: Move this to the translator plugin API.
+ */
+function tmgmt_local_tmgmt_job_item_update(TMGMTJobItem $job_item) {
+  if ($job_item->isAccepted() && !$job_item->original->isAccepted()) {
+    $tltiid = db_query('SELECT tltiid FROM {tmgmt_local_task_item} ti INNER JOIN {tmgmt_local_task} t ON ti.tltid = t.tltid WHERE t.tjid = :tjid AND ti.tjiid = :tjiid', array(':tjid' => $job_item->tjid, ':tjiid' => $job_item->tjiid))->fetchField();
+    $task_item = tmgmt_local_task_item_load($tltiid);
+    $task_item->completed();
+    $task_item->save();
+  }
+}
diff --git a/translators/tmgmt_local/tmgmt_local.test b/translators/tmgmt_local/tmgmt_local.test
index 81ea238..3c3517d 100644
--- a/translators/tmgmt_local/tmgmt_local.test
+++ b/translators/tmgmt_local/tmgmt_local.test
@@ -244,9 +244,10 @@ class TMGMTLocalTestCase extends TMGMTBaseTestCase {
 
     // Translate the task.
     $this->drupalGet('translate');
-    $this->clickLink(t('translate'));
+    $this->clickLink(t('view'));
     $this->assertText(t('Translation for @source', array('@source' => 'test_source:test:1')));
     $this->assertText(t('Translation for @source', array('@source' => 'test_source:test:2')));
+    $this->assertText(t('Untranslated'));
 
     // Translate the first item.
     $this->clickLink(t('translate'));
@@ -254,8 +255,7 @@ class TMGMTLocalTestCase extends TMGMTBaseTestCase {
     $this->assertText(t('Dummy'));
     // Job comment is present in the translate tool as well.
     $this->assertText($job_comment);
-    // @todo: Improve title.
-    $this->assertText(t('Translate Task Item'));
+    $this->assertText(t('Translation for @source', array('@source' => 'test_source:test:1')));
 
     // Try to complete a translation when translations are missing.
     $this->drupalPost(NULL, array(), t('Save as completed'));
@@ -267,8 +267,8 @@ class TMGMTLocalTestCase extends TMGMTBaseTestCase {
     $this->drupalPost(NULL, $edit, t('Save as completed'));
 
     // The first item should be accepted now, the second still in progress.
-    $this->assertText(t('Accepted'));
-    $this->assertText(t('In progress'));
+    $this->assertText(t('Completed'));
+    $this->assertText(t('Untranslated'));
 
     // Translate the second item but do not accept it yet.
     $this->clickLink(t('translate'));
@@ -277,20 +277,30 @@ class TMGMTLocalTestCase extends TMGMTBaseTestCase {
     );
     $this->drupalPost(NULL, $edit, t('Save'));
     // The first item should be accepted now, the second still in progress.
-    $this->assertText(t('Accepted'));
-    $this->assertText(t('In progress'));
+    $this->assertText(t('Completed'));
+    $this->assertText(t('Untranslated'));
+
+    // Check the job data, which should not yet contain the translation.
+    entity_get_controller('tmgmt_job')->resetCache(array($job->tjid));
+    entity_get_controller('tmgmt_job_item')->resetCache();
+    $job = tmgmt_job_load($job->tjid);
+    list($item1, $item2) = array_values($job->getItems());
+    // The text in the first item should be available for review, the
+    // translation of the second item not.
+    $this->assertEqual($item1->getData(array('dummy', 'deep_nesting', '#translation', '#text')), $translation1);
+    $this->assertEqual($item2->getData(array('dummy', 'deep_nesting', '#translation', '#text')), '');
 
     // Check the overview page, the task should still show in progress.
     $this->drupalGet('translate');
     $this->assertText(t('Pending'));
 
     // Mark the second item as completed now.
-    $this->clickLink(t('translate'));
+    $this->clickLink(t('view'));
     $this->clickLink(t('translate'));
     $this->drupalPost(NULL, array(), t('Save as completed'));
     // Both items should be accepted now.
-    $this->assertText(t('Accepted'));
-    $this->assertNoText(t('In progress'));
+    $this->assertText(t('Completed'));
+    $this->assertNoText(t('Untranslated'));
 
     // Check the overview, the task should be completed now.
     $this->drupalGet('translate');
diff --git a/translators/tmgmt_local/views/handlers/tmgmt_local_task_handler_field_assign.inc b/translators/tmgmt_local/views/handlers/tmgmt_local_task_handler_field_assign.inc
deleted file mode 100644
index 02ab018..0000000
--- a/translators/tmgmt_local/views/handlers/tmgmt_local_task_handler_field_assign.inc
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * Field handler which shows the link for assign translation task to selected
- * user.
- *
- * @ingroup views_field_handlers
- */
-class tmgmt_local_task_handler_field_assign extends views_handler_field_entity {
-
-  function render($values) {
-    /**
-     * @var TMGMTLocalTask $task
-     */
-    $task = $this->get_value($values);
-
-    if (tmgmt_local_translation_access($task)) {
-      $element = array(
-        '#theme' => 'link',
-        '#path' => 'manage-translate/assign-tasks/' . $task->tltid,
-        '#options' => array(
-          'query' => array('destination' => current_path()),
-          'attributes' => array(),
-          'title' => t('assign'),
-          'html' => FALSE,
-        ),
-        '#text' => t('assign'),
-      );
-      return drupal_render($element);
-    }
-    return '';
-  }
-
-}
diff --git a/translators/tmgmt_local/views/handlers/tmgmt_local_task_handler_field_assign_to_me.inc b/translators/tmgmt_local/views/handlers/tmgmt_local_task_handler_field_assign_to_me.inc
deleted file mode 100644
index 0b764eb..0000000
--- a/translators/tmgmt_local/views/handlers/tmgmt_local_task_handler_field_assign_to_me.inc
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * Field handler which shows the link for assign translation task to current
- * user.
- *
- * @ingroup views_field_handlers
- */
-class tmgmt_local_task_handler_field_assign_to_me extends views_handler_field_entity {
-
-  function render($values) {
-    /**
-     * @var TMGMTLocalTask $task
-     */
-    $task = $this->get_value($values);
-
-    if (tmgmt_local_translation_access($task)) {
-      $element = array(
-        '#theme' => 'link',
-        '#path' => 'translate/' . $task->tltid . '/assign-to-me',
-        '#options' => array(
-          'query' => array('destination' => current_path()),
-          'attributes' => array(),
-          'title' => t('assign to me'),
-          'html' => FALSE,
-        ),
-        '#text' => t('assign'),
-      );
-      return drupal_render($element);
-    }
-    return '';
-  }
-
-}
diff --git a/translators/tmgmt_local/views/handlers/tmgmt_local_task_handler_field_item_operations.inc b/translators/tmgmt_local/views/handlers/tmgmt_local_task_handler_field_item_operations.inc
new file mode 100644
index 0000000..5fbd0d6
--- /dev/null
+++ b/translators/tmgmt_local/views/handlers/tmgmt_local_task_handler_field_item_operations.inc
@@ -0,0 +1,34 @@
+<?php
+
+/**
+ * Field handler which shows the link for translating translation task items.
+ *
+ * @ingroup views_field_handlers
+ */
+class tmgmt_local_task_handler_field_item_operations extends views_handler_field_entity {
+
+  function render($values) {
+    global $user;
+    /**
+     * @var TMGMTLocalTaskItem $item
+     */
+    $item = $this->get_value($values);
+
+    $element = array();
+    $element['#theme'] = 'links';
+    $element['#attributes'] = array('class' => array('links', 'inline'));
+    // Only allow to translate if the job is assigned to this user.
+    if (entity_access('view', 'tmgmt_local_task_item', $item) && $item->getTask()->tuid == $user->uid) {
+      $element['#links']['translate'] = array(
+        'href' => 'translate/' . $item->tltid . '/item/' . $item->tltiid,
+        'query' => array('destination' => current_path()),
+        'attributes' => array(
+          'title' => $item->isUntranslated() ? t('Translate') : t('View'),
+        ),
+        'title' => $item->isUntranslated() ? t('translate') : t('view'),
+      );
+    }
+    return drupal_render($element);
+  }
+
+}
diff --git a/translators/tmgmt_local/views/handlers/tmgmt_local_task_handler_field_operations.inc b/translators/tmgmt_local/views/handlers/tmgmt_local_task_handler_field_operations.inc
index c3f120b..1fae5a9 100644
--- a/translators/tmgmt_local/views/handlers/tmgmt_local_task_handler_field_operations.inc
+++ b/translators/tmgmt_local/views/handlers/tmgmt_local_task_handler_field_operations.inc
@@ -17,14 +17,56 @@ class tmgmt_local_task_handler_field_operations extends views_handler_field_enti
 
     $element = array();
     $element['#theme'] = 'links';
-    $element['#attributes'] = array('class' => array('inline'));
+    $element['#attributes'] = array('class' => array('links', 'inline'));
     $uri = $task->uri();
-    if (entity_access('edit', 'tmgmt_local_task', $task)) {
-      $element['#links']['edit'] = array(
+    if (entity_access('view', 'tmgmt_local_task', $task)) {
+      $element['#links']['view'] = array(
         'href' => $uri['path'],
         'query' => array('destination' => current_path()),
-        'title' => t('edit'),
+        'title' => t('view'),
       );
+    }
+    if (user_access('administer translation tasks') && tmgmt_local_translation_access($task) && empty($task->tuid)) {
+      $element['#links']['assign'] = array(
+        'href' => 'manage-translate/assign-tasks/' . $task->tltid,
+        'query' => array('destination' => current_path()),
+        'attributes' => array(
+          'title' => t('Assign'),
+        ),
+        'title' => t('assign'),
+      );
+    }
+    elseif (tmgmt_local_translation_access($task) && empty($task->tuid)) {
+      $element['#links']['assign_to_me'] = array(
+        'href' => 'translate/' . $task->tltid . '/assign-to-me',
+        'query' => array('destination' => current_path()),
+        'attributes' => array(
+          'title' => t('Assign to me'),
+        ),
+        'title' => t('assign'),
+      );
+    }
+    elseif (tmgmt_local_translation_access($task) && empty($task->tuid)) {
+      $element['#links']['assign_to_me'] = array(
+        'href' => 'translate/' . $task->tltid . '/assign-to-me',
+        'query' => array('destination' => current_path()),
+        'attributes' => array(
+          'title' => t('Assign to me'),
+        ),
+        'title' => t('assign'),
+      );
+    }
+    if (!empty($task->tuid) && entity_access('unassign', 'tmgmt_local_task', $task)) {
+      $element['#links']['unassign'] = array(
+        'href' => 'translate/' . $task->tltid . '/unassign',
+        'query' => array('destination' => current_path()),
+        'attributes' => array(
+          'title' => t('Unassign'),
+        ),
+        'title' => t('unassign'),
+      );
+    }
+    if (entity_access('delete', 'tmgmt_local_task', $task)) {
       $element['#links']['delete'] = array(
         'href' => $uri['path'] . '/delete',
         'query' => array('destination' => current_path()),
diff --git a/translators/tmgmt_local/views/handlers/tmgmt_local_task_handler_field_translate.inc b/translators/tmgmt_local/views/handlers/tmgmt_local_task_handler_field_translate.inc
deleted file mode 100644
index 4144f7e..0000000
--- a/translators/tmgmt_local/views/handlers/tmgmt_local_task_handler_field_translate.inc
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-/**
- * Field handler which shows the link for translating translation task items.
- *
- * @ingroup views_field_handlers
- */
-class tmgmt_local_task_handler_field_translate extends views_handler_field_entity {
-
-  function render($values) {
-    /**
-     * @var TMGMTLocalTask $task
-     */
-    $task = $this->get_value($values);
-
-    if (tmgmt_local_translation_access($task)) {
-      $element = array(
-        '#theme' => 'link',
-        '#path' => 'translate/' . $task->tltid,
-        '#options' => array(
-          'query' => array('destination' => current_path()),
-          'attributes' => array(),
-          'title' => t('translate'),
-          'html' => FALSE,
-        ),
-        '#text' => t('translate'),
-      );
-      return drupal_render($element);
-    }
-    return '';
-  }
-
-}
diff --git a/translators/tmgmt_local/views/handlers/tmgmt_local_task_handler_field_translate_task_item.inc b/translators/tmgmt_local/views/handlers/tmgmt_local_task_handler_field_translate_task_item.inc
deleted file mode 100644
index 707b4af..0000000
--- a/translators/tmgmt_local/views/handlers/tmgmt_local_task_handler_field_translate_task_item.inc
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-/**
- * Field handler which shows the link for translating translation task items.
- *
- * @ingroup views_field_handlers
- */
-class tmgmt_local_task_handler_field_translate_task_item extends views_handler_field_entity {
-
-  function render($values) {
-    /**
-     * @var TMGMTLocalTask $task
-     */
-    $task = $this->get_value($values);
-
-    // @todo- is there a better way to get item id? This way we are
-    // dependent on db values.
-    $tjiid = $values->tjiid;
-    $job_item = tmgmt_job_item_load($tjiid);
-    if (tmgmt_local_translation_access($task) && $job_item->isActive()) {
-      $element = array(
-        '#theme' => 'link',
-        '#path' => 'translate/' . $task->tltid . '/item/' . $tjiid,
-        '#options' => array(
-          'query' => array('destination' => current_path()),
-          'attributes' => array(),
-          'title' => t('translate'),
-          'html' => FALSE,
-        ),
-        '#text' => t('translate'),
-      );
-      return drupal_render($element);
-    }
-    return '';
-  }
-
-}
diff --git a/translators/tmgmt_local/views/handlers/tmgmt_local_task_handler_field_view.inc b/translators/tmgmt_local/views/handlers/tmgmt_local_task_handler_field_view.inc
deleted file mode 100644
index a3041ee..0000000
--- a/translators/tmgmt_local/views/handlers/tmgmt_local_task_handler_field_view.inc
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-/**
- * Field handler which shows the manager view link for translation task.
- *
- * @ingroup views_field_handlers
- */
-class tmgmt_local_task_handler_field_view extends views_handler_field_entity {
-
-  function render($values) {
-    /**
-     * @var TMGMTLocalTask $task
-     */
-    $task = $this->get_value($values);
-
-    if (user_access('administer translation tasks')) {
-      $element = array(
-        '#theme' => 'link',
-        '#path' => 'manage-translate/task/' . $task->tltid,
-        '#options' => array(
-          'query' => array('destination' => current_path()),
-          'attributes' => array(),
-          'title' => t('view'),
-          'html' => FALSE,
-        ),
-        '#text' => t('view'),
-      );
-      return drupal_render($element);
-    }
-    return '';
-  }
-
-}
diff --git a/translators/tmgmt_local/views/tmgmt_local.views.inc b/translators/tmgmt_local/views/tmgmt_local.views.inc
index 5463103..36368b9 100644
--- a/translators/tmgmt_local/views/tmgmt_local.views.inc
+++ b/translators/tmgmt_local/views/tmgmt_local.views.inc
@@ -17,7 +17,7 @@ class TMGMTLocalTaskViewsController extends EntityDefaultViewsController {
     $data = parent::views_data();
     $data['tmgmt_local_task']['operations'] = array(
       'title' => t('Operations'),
-      'help' => t('Displays a list of edit operations which are available for a task.'),
+      'help' => t('Displays a list of operations which are available for a task.'),
       'real field' => 'tltid',
       'field' => array(
         'handler' => 'tmgmt_local_task_handler_field_operations',
@@ -47,22 +47,6 @@ class TMGMTLocalTaskViewsController extends EntityDefaultViewsController {
         'handler' => 'tmgmt_local_task_handler_field_job_item_count',
       ),
     );
-    $data['tmgmt_local_task']['assign_to_me'] = array(
-      'title' => t('Assign to me'),
-      'help' => t('Assign translation task to current user link.'),
-      'real field' => 'tltid',
-      'field' => array(
-        'handler' => 'tmgmt_local_task_handler_field_assign_to_me',
-      ),
-    );
-    $data['tmgmt_local_task']['translate'] = array(
-      'title' => t('Translate task items'),
-      'help' => t('Translate task items link.'),
-      'real field' => 'tltid',
-      'field' => array(
-        'handler' => 'tmgmt_local_task_handler_field_translate',
-      ),
-    );
     $data['tmgmt_job']['eligible'] = array(
       'title' => t('Eligible'),
       'help' => t('Limit translation tasks to those that the user can translate'),
@@ -72,22 +56,6 @@ class TMGMTLocalTaskViewsController extends EntityDefaultViewsController {
       ),
     );
     // Manager handlers.
-    $data['tmgmt_local_task']['assign'] = array(
-      'title' => t('Assign'),
-      'help' => t('Assign translation task to specific translator.'),
-      'real field' => 'tltid',
-      'field' => array(
-        'handler' => 'tmgmt_local_task_handler_field_assign',
-      ),
-    );
-    $data['tmgmt_local_task']['view'] = array(
-      'title' => t('Manager View'),
-      'help' => t('Manager view for translation task.'),
-      'real field' => 'tltid',
-      'field' => array(
-        'handler' => 'tmgmt_local_task_handler_field_view',
-      ),
-    );
     $data['tmgmt_job']['task'] = array(
       'title' => t('Translation task'),
       'help' => t('Get the translation task of the job'),
@@ -98,16 +66,30 @@ class TMGMTLocalTaskViewsController extends EntityDefaultViewsController {
         'label' => t('Job'),
       ),
     );
-    $data['tmgmt_local_task']['translate_task_item'] = array(
-      'title' => t('Translate Task Item'),
-      'help' => t('Display a link for translating translation task item.'),
-      'real field' => 'tltid',
+
+    return $data;
+  }
+
+}
+
+/**
+ * Views controller class for the translation task item entity.
+ */
+class TMGMTLocalTaskItemViewsController extends EntityDefaultViewsController {
+
+  /**
+   * Overrides EntityDefaultViewsController::views_data().
+   */
+  public function views_data() {
+    $data = parent::views_data();
+    $data['tmgmt_local_task_item']['operations'] = array(
+      'title' => t('Operations'),
+      'help' => t('Displays a list of operations which are available for a task item.'),
+      'real field' => 'tltiid',
       'field' => array(
-        'handler' => 'tmgmt_local_task_handler_field_translate_task_item',
+        'handler' => 'tmgmt_local_task_handler_field_item_operations',
       ),
     );
-
     return $data;
   }
-
 }
diff --git a/translators/tmgmt_local/views/tmgmt_local_manage_translate_task.view.inc b/translators/tmgmt_local/views/tmgmt_local_manage_translate_task.view.inc
index e302c40..1aaf092 100644
--- a/translators/tmgmt_local/views/tmgmt_local_manage_translate_task.view.inc
+++ b/translators/tmgmt_local/views/tmgmt_local_manage_translate_task.view.inc
@@ -5,7 +5,7 @@ $view->name = 'tmgmt_local_manage_translate_task';
 $view->description = 'Gives a bulk operation overview of translation tasks in the system.';
 $view->tag = 'default';
 $view->base_table = 'tmgmt_local_task';
-$view->human_name = 'Manage Translate Tasks';
+$view->human_name = 'Manage Translation Tasks';
 $view->core = 7;
 $view->api_version = '3.0';
 $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
@@ -20,13 +20,22 @@ $handler->display->display_options['cache']['type'] = 'none';
 $handler->display->display_options['query']['type'] = 'views_query';
 $handler->display->display_options['exposed_form']['type'] = 'basic';
 $handler->display->display_options['pager']['type'] = 'full';
-$handler->display->display_options['pager']['options']['items_per_page'] = '10';
+$handler->display->display_options['pager']['options']['items_per_page'] = '25';
+$handler->display->display_options['pager']['options']['offset'] = '0';
+$handler->display->display_options['pager']['options']['id'] = '0';
+$handler->display->display_options['pager']['options']['quantity'] = '9';
 $handler->display->display_options['style_plugin'] = 'table';
-/* Relationship: Translation Management Local Task: Translation Job tjid */
+/* Header: Global: Text area */
+$handler->display->display_options['header']['area']['id'] = 'area';
+$handler->display->display_options['header']['area']['table'] = 'views';
+$handler->display->display_options['header']['area']['field'] = 'area';
+$handler->display->display_options['header']['area']['empty'] = TRUE;
+$handler->display->display_options['header']['area']['format'] = 'filtered_html';
+/* Relationship: Translation Task: Translation Job tjid */
 $handler->display->display_options['relationships']['job']['id'] = 'job';
 $handler->display->display_options['relationships']['job']['table'] = 'tmgmt_local_task';
 $handler->display->display_options['relationships']['job']['field'] = 'job';
-/* Field: Bulk operations: Translation Management Local Task */
+/* Field: Bulk operations: Translation Task */
 $handler->display->display_options['fields']['views_bulk_operations']['id'] = 'views_bulk_operations';
 $handler->display->display_options['fields']['views_bulk_operations']['table'] = 'tmgmt_local_task';
 $handler->display->display_options['fields']['views_bulk_operations']['field'] = 'views_bulk_operations';
@@ -35,47 +44,45 @@ $handler->display->display_options['fields']['views_bulk_operations']['element_l
 $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']['display_result'] = 1;
 $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(
   'rules_component::rules_tmgmt_local_task_assign1' => array(
     'selected' => 0,
-    'use_queue' => 0,
     'skip_confirmation' => 0,
     'override_label' => 0,
     'label' => '',
+    'postpone_processing' => 0,
   ),
   'rules_component::rules_tmgmt_local_task_assign' => array(
     'selected' => 0,
-    'use_queue' => 0,
     'skip_confirmation' => 0,
     'override_label' => 0,
     'label' => '',
+    'postpone_processing' => 0,
   ),
   'action::views_bulk_operations_delete_item' => array(
     'selected' => 1,
-    '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::views_bulk_operations_modify_action' => array(
     'selected' => 0,
-    'use_queue' => 0,
     'skip_confirmation' => 0,
     'override_label' => 0,
     'label' => '',
@@ -85,6 +92,7 @@ $handler->display->display_options['fields']['views_bulk_operations']['vbo_opera
         '_all_' => '_all_',
       ),
     ),
+    'postpone_processing' => 0,
   ),
   'action::views_bulk_operations_argument_selector_action' => array(
     'selected' => 0,
@@ -97,47 +105,47 @@ $handler->display->display_options['fields']['views_bulk_operations']['vbo_opera
   ),
   'action::system_goto_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,
   ),
   'rules_component::rules_test' => array(
     'selected' => 0,
-    'use_queue' => 0,
     'skip_confirmation' => 0,
     'override_label' => 0,
     'label' => '',
+    'postpone_processing' => 0,
   ),
   'rules_component::rules_tmgmt_local_task_assign_to_me' => array(
     'selected' => 0,
-    'use_queue' => 0,
     'skip_confirmation' => 1,
     'override_label' => 1,
     'label' => 'Assign to me',
+    'postpone_processing' => 0,
   ),
 );
-/* Field: Translation Management Local Task: Title */
+/* Field: Translation Task: Title */
 $handler->display->display_options['fields']['title']['id'] = 'title';
 $handler->display->display_options['fields']['title']['table'] = 'tmgmt_local_task';
 $handler->display->display_options['fields']['title']['field'] = 'title';
-/* Field: Translation Management Local Task: Word count */
+/* Field: Translation Task: Word count */
 $handler->display->display_options['fields']['word_count']['id'] = 'word_count';
 $handler->display->display_options['fields']['word_count']['table'] = 'tmgmt_local_task';
 $handler->display->display_options['fields']['word_count']['field'] = 'word_count';
 $handler->display->display_options['fields']['word_count']['element_label_colon'] = FALSE;
-/* Field: Translation Management Local Task: Job item count */
+/* Field: Translation Task: Job item count */
 $handler->display->display_options['fields']['item_count']['id'] = 'item_count';
 $handler->display->display_options['fields']['item_count']['table'] = 'tmgmt_local_task';
 $handler->display->display_options['fields']['item_count']['field'] = 'item_count';
-/* Field: Translation Management Local Task: Progress */
+/* Field: Translation Task: Progress */
 $handler->display->display_options['fields']['progress']['id'] = 'progress';
 $handler->display->display_options['fields']['progress']['table'] = 'tmgmt_local_task';
 $handler->display->display_options['fields']['progress']['field'] = 'progress';
@@ -145,7 +153,7 @@ $handler->display->display_options['fields']['progress']['field'] = 'progress';
 /* Display: Main */
 $handler = $view->new_display('page', 'Main', 'unassigned');
 $handler->display->display_options['defaults']['title'] = FALSE;
-$handler->display->display_options['title'] = 'Unassigned Tasks';
+$handler->display->display_options['title'] = 'Manage Translation Tasks';
 $handler->display->display_options['display_description'] = 'Shows main view elegible (unasigned) tasks and assigned.';
 $handler->display->display_options['defaults']['hide_admin_links'] = FALSE;
 $handler->display->display_options['defaults']['style_plugin'] = FALSE;
@@ -214,7 +222,7 @@ $handler->display->display_options['defaults']['footer'] = FALSE;
 $handler->display->display_options['footer']['view']['id'] = 'view';
 $handler->display->display_options['footer']['view']['table'] = 'views';
 $handler->display->display_options['footer']['view']['field'] = 'view';
-$handler->display->display_options['footer']['view']['view_to_insert'] = 'tmgmt_local_manage_translate_task:assigned';
+$handler->display->display_options['footer']['view']['view_to_insert'] = 'tmgmt_local_manage_translate_task:pending';
 $handler->display->display_options['defaults']['empty'] = FALSE;
 /* No results behavior: Global: Text area */
 $handler->display->display_options['empty']['area']['id'] = 'area';
@@ -225,13 +233,13 @@ $handler->display->display_options['empty']['area']['empty'] = TRUE;
 $handler->display->display_options['empty']['area']['content'] = 'There are no unassigned tasks.';
 $handler->display->display_options['empty']['area']['format'] = 'filtered_html';
 $handler->display->display_options['defaults']['relationships'] = FALSE;
-/* Relationship: Translation Management Local Task: Translation Job tjid */
+/* Relationship: Translation Task: Translation Job tjid */
 $handler->display->display_options['relationships']['job']['id'] = 'job';
 $handler->display->display_options['relationships']['job']['table'] = 'tmgmt_local_task';
 $handler->display->display_options['relationships']['job']['field'] = 'job';
 $handler->display->display_options['relationships']['job']['required'] = TRUE;
 $handler->display->display_options['defaults']['fields'] = FALSE;
-/* Field: Bulk operations: Translation Management Local Task */
+/* Field: Bulk operations: Translation Task */
 $handler->display->display_options['fields']['views_bulk_operations']['id'] = 'views_bulk_operations';
 $handler->display->display_options['fields']['views_bulk_operations']['table'] = 'tmgmt_local_task';
 $handler->display->display_options['fields']['views_bulk_operations']['field'] = 'views_bulk_operations';
@@ -240,47 +248,45 @@ $handler->display->display_options['fields']['views_bulk_operations']['element_l
 $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']['display_result'] = 1;
 $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(
   'rules_component::rules_tmgmt_local_task_assign' => array(
     'selected' => 0,
-    'use_queue' => 0,
     'skip_confirmation' => 0,
     'override_label' => 0,
     'label' => '',
+    'postpone_processing' => 0,
   ),
   'rules_component::rules_tmgmt_local_task_assign_to_me' => array(
     'selected' => 0,
-    'use_queue' => 0,
     'skip_confirmation' => 1,
     'override_label' => 1,
     'label' => 'Assign to me',
+    '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::views_bulk_operations_modify_action' => array(
     'selected' => 0,
-    'use_queue' => 0,
     'skip_confirmation' => 0,
     'override_label' => 0,
     'label' => '',
@@ -290,6 +296,7 @@ $handler->display->display_options['fields']['views_bulk_operations']['vbo_opera
         '_all_' => '_all_',
       ),
     ),
+    'postpone_processing' => 0,
   ),
   'action::views_bulk_operations_argument_selector_action' => array(
     'selected' => 1,
@@ -302,33 +309,27 @@ $handler->display->display_options['fields']['views_bulk_operations']['vbo_opera
   ),
   'action::system_goto_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,
   ),
   'rules_component::rules_tmgmt_local_task_unassign' => array(
     'selected' => 0,
-    'use_queue' => 0,
     'skip_confirmation' => 0,
     'override_label' => 0,
     'label' => '',
+    'postpone_processing' => 0,
   ),
 );
-/* Field: Translation Management Local Task: Created */
-$handler->display->display_options['fields']['created']['id'] = 'created';
-$handler->display->display_options['fields']['created']['table'] = 'tmgmt_local_task';
-$handler->display->display_options['fields']['created']['field'] = 'created';
-$handler->display->display_options['fields']['created']['label'] = 'Date';
-$handler->display->display_options['fields']['created']['date_format'] = 'short';
-/* Field: Translation Management Local Task: Title */
+/* Field: Translation Task: Title */
 $handler->display->display_options['fields']['title']['id'] = 'title';
 $handler->display->display_options['fields']['title']['table'] = 'tmgmt_local_task';
 $handler->display->display_options['fields']['title']['field'] = 'title';
@@ -346,40 +347,43 @@ $handler->display->display_options['fields']['target_language']['field'] = 'targ
 $handler->display->display_options['fields']['target_language']['relationship'] = 'job';
 $handler->display->display_options['fields']['target_language']['label'] = 'Target language';
 $handler->display->display_options['fields']['target_language']['machine_name'] = TRUE;
-/* Field: Translation Management Local Task: Word count */
+/* Field: Translation Task: Word count */
 $handler->display->display_options['fields']['word_count']['id'] = 'word_count';
 $handler->display->display_options['fields']['word_count']['table'] = 'tmgmt_local_task';
 $handler->display->display_options['fields']['word_count']['field'] = 'word_count';
 $handler->display->display_options['fields']['word_count']['element_label_colon'] = FALSE;
-/* Field: Translation Management Local Task: Job item count */
+/* Field: Translation Task: Job item count */
 $handler->display->display_options['fields']['item_count']['id'] = 'item_count';
 $handler->display->display_options['fields']['item_count']['table'] = 'tmgmt_local_task';
 $handler->display->display_options['fields']['item_count']['field'] = 'item_count';
 $handler->display->display_options['fields']['item_count']['label'] = 'Item count';
-/* Field: Translation Management Local Task: Loop_count */
+/* Field: Translation Task: Loop_count */
 $handler->display->display_options['fields']['loop_count']['id'] = 'loop_count';
 $handler->display->display_options['fields']['loop_count']['table'] = 'tmgmt_local_task';
 $handler->display->display_options['fields']['loop_count']['field'] = 'loop_count';
 $handler->display->display_options['fields']['loop_count']['label'] = 'Loop count';
-/* Field: Translation Management Local Task: Assign */
-$handler->display->display_options['fields']['assign']['id'] = 'assign';
-$handler->display->display_options['fields']['assign']['table'] = 'tmgmt_local_task';
-$handler->display->display_options['fields']['assign']['field'] = 'assign';
-$handler->display->display_options['fields']['assign']['label'] = 'Action';
+/* Field: Translation Task: Operations */
+$handler->display->display_options['fields']['operations']['id'] = 'operations';
+$handler->display->display_options['fields']['operations']['table'] = 'tmgmt_local_task';
+$handler->display->display_options['fields']['operations']['field'] = 'operations';
 $handler->display->display_options['defaults']['filter_groups'] = FALSE;
 $handler->display->display_options['defaults']['filters'] = FALSE;
-/* Filter criterion: Translation Management Local Task: Status */
+/* Filter criterion: Translation Task: Status */
 $handler->display->display_options['filters']['status']['id'] = 'status';
 $handler->display->display_options['filters']['status']['table'] = 'tmgmt_local_task';
 $handler->display->display_options['filters']['status']['field'] = 'status';
 $handler->display->display_options['filters']['status']['value'] = array(
   0 => '0',
 );
-$handler->display->display_options['path'] = 'manage-translate';
-$handler->display->display_options['menu']['type'] = 'normal';
-$handler->display->display_options['menu']['title'] = 'Manage Translate Tasks';
+$handler->display->display_options['path'] = 'manage-translate/default';
+$handler->display->display_options['menu']['type'] = 'default tab';
+$handler->display->display_options['menu']['title'] = 'Unassigned';
 $handler->display->display_options['menu']['weight'] = '0';
 $handler->display->display_options['menu']['context'] = 0;
+$handler->display->display_options['tab_options']['type'] = 'normal';
+$handler->display->display_options['tab_options']['title'] = 'Manage translation tasks';
+$handler->display->display_options['tab_options']['weight'] = '0';
+$handler->display->display_options['tab_options']['name'] = 'user-menu';
 
 /* Display: Assigned */
 $handler = $view->new_display('page', 'Assigned', 'assigned');
@@ -459,39 +463,33 @@ $handler->display->display_options['empty']['area']['empty'] = TRUE;
 $handler->display->display_options['empty']['area']['content'] = 'There are no unassigned tasks.';
 $handler->display->display_options['empty']['area']['format'] = 'filtered_html';
 $handler->display->display_options['defaults']['relationships'] = FALSE;
-/* Relationship: Translation Management Local Task: Translation Job tjid */
+/* Relationship: Translation Task: Translation Job tjid */
 $handler->display->display_options['relationships']['job']['id'] = 'job';
 $handler->display->display_options['relationships']['job']['table'] = 'tmgmt_local_task';
 $handler->display->display_options['relationships']['job']['field'] = 'job';
 $handler->display->display_options['relationships']['job']['required'] = TRUE;
-/* Relationship: Translation Management Local Task: Translator tuid */
+/* Relationship: Translation Task: Translator tuid */
 $handler->display->display_options['relationships']['translator']['id'] = 'translator';
 $handler->display->display_options['relationships']['translator']['table'] = 'tmgmt_local_task';
 $handler->display->display_options['relationships']['translator']['field'] = 'translator';
-$handler->display->display_options['relationships']['translator']['label'] = 'Translator User';
+$handler->display->display_options['relationships']['translator']['label'] = 'Translator';
 $handler->display->display_options['relationships']['translator']['required'] = TRUE;
 $handler->display->display_options['defaults']['fields'] = FALSE;
-/* Field: Translation Management Local Task: Status */
+/* Field: Translation Task: Status */
 $handler->display->display_options['fields']['status']['id'] = 'status';
 $handler->display->display_options['fields']['status']['table'] = 'tmgmt_local_task';
 $handler->display->display_options['fields']['status']['field'] = 'status';
-/* Field: Translation Management Local Task: Progress */
+/* Field: Translation Task: Progress */
 $handler->display->display_options['fields']['progress']['id'] = 'progress';
 $handler->display->display_options['fields']['progress']['table'] = 'tmgmt_local_task';
 $handler->display->display_options['fields']['progress']['field'] = 'progress';
-/* Field: Translation Management Local Task: Created */
-$handler->display->display_options['fields']['created']['id'] = 'created';
-$handler->display->display_options['fields']['created']['table'] = 'tmgmt_local_task';
-$handler->display->display_options['fields']['created']['field'] = 'created';
-$handler->display->display_options['fields']['created']['label'] = 'Date';
-$handler->display->display_options['fields']['created']['date_format'] = 'short';
 /* Field: User: Name */
 $handler->display->display_options['fields']['name']['id'] = 'name';
 $handler->display->display_options['fields']['name']['table'] = 'users';
 $handler->display->display_options['fields']['name']['field'] = 'name';
 $handler->display->display_options['fields']['name']['relationship'] = 'translator';
 $handler->display->display_options['fields']['name']['label'] = 'Assignee';
-/* Field: Translation Management Local Task: Title */
+/* Field: Translation Task: Title */
 $handler->display->display_options['fields']['title']['id'] = 'title';
 $handler->display->display_options['fields']['title']['table'] = 'tmgmt_local_task';
 $handler->display->display_options['fields']['title']['field'] = 'title';
@@ -509,29 +507,28 @@ $handler->display->display_options['fields']['target_language']['field'] = 'targ
 $handler->display->display_options['fields']['target_language']['relationship'] = 'job';
 $handler->display->display_options['fields']['target_language']['label'] = 'Target language';
 $handler->display->display_options['fields']['target_language']['machine_name'] = TRUE;
-/* Field: Translation Management Local Task: Word count */
+/* Field: Translation Task: Word count */
 $handler->display->display_options['fields']['word_count']['id'] = 'word_count';
 $handler->display->display_options['fields']['word_count']['table'] = 'tmgmt_local_task';
 $handler->display->display_options['fields']['word_count']['field'] = 'word_count';
 $handler->display->display_options['fields']['word_count']['element_label_colon'] = FALSE;
-/* Field: Translation Management Local Task: Job item count */
+/* Field: Translation Task: Job item count */
 $handler->display->display_options['fields']['item_count']['id'] = 'item_count';
 $handler->display->display_options['fields']['item_count']['table'] = 'tmgmt_local_task';
 $handler->display->display_options['fields']['item_count']['field'] = 'item_count';
 $handler->display->display_options['fields']['item_count']['label'] = 'Item count';
-/* Field: Translation Management Local Task: Loop_count */
+/* Field: Translation Task: Loop_count */
 $handler->display->display_options['fields']['loop_count']['id'] = 'loop_count';
 $handler->display->display_options['fields']['loop_count']['table'] = 'tmgmt_local_task';
 $handler->display->display_options['fields']['loop_count']['field'] = 'loop_count';
 $handler->display->display_options['fields']['loop_count']['label'] = 'Loop count';
-/* Field: Translation Management Local Task: Manager View */
-$handler->display->display_options['fields']['view']['id'] = 'view';
-$handler->display->display_options['fields']['view']['table'] = 'tmgmt_local_task';
-$handler->display->display_options['fields']['view']['field'] = 'view';
-$handler->display->display_options['fields']['view']['label'] = 'Action';
+/* Field: Translation Task: Operations */
+$handler->display->display_options['fields']['operations']['id'] = 'operations';
+$handler->display->display_options['fields']['operations']['table'] = 'tmgmt_local_task';
+$handler->display->display_options['fields']['operations']['field'] = 'operations';
 $handler->display->display_options['defaults']['filter_groups'] = FALSE;
 $handler->display->display_options['defaults']['filters'] = FALSE;
-/* Filter criterion: Translation Management Local Task: Status */
+/* Filter criterion: Translation Task: Status */
 $handler->display->display_options['filters']['status']['id'] = 'status';
 $handler->display->display_options['filters']['status']['table'] = 'tmgmt_local_task';
 $handler->display->display_options['filters']['status']['field'] = 'status';
@@ -539,7 +536,7 @@ $handler->display->display_options['filters']['status']['operator'] = 'not in';
 $handler->display->display_options['filters']['status']['value'] = array(
   0 => '0',
 );
-/* Filter criterion: Translation Management Local Task: Status */
+/* Filter criterion: Translation Task: Status */
 $handler->display->display_options['filters']['status_1']['id'] = 'status_1';
 $handler->display->display_options['filters']['status_1']['table'] = 'tmgmt_local_task';
 $handler->display->display_options['filters']['status_1']['field'] = 'status';
@@ -614,7 +611,7 @@ $handler->display->display_options['filters']['uid']['expose']['remember_roles']
   8 => 0,
   10 => 0,
 );
-/* Filter criterion: Translation Management Local Task: Title */
+/* Filter criterion: Translation Task: Title */
 $handler->display->display_options['filters']['title']['id'] = 'title';
 $handler->display->display_options['filters']['title']['table'] = 'tmgmt_local_task';
 $handler->display->display_options['filters']['title']['field'] = 'title';
@@ -631,9 +628,10 @@ $handler->display->display_options['filters']['title']['expose']['remember_roles
   10 => 0,
 );
 $handler->display->display_options['path'] = 'manage-translate/assigned';
-$handler->display->display_options['menu']['type'] = 'normal';
+$handler->display->display_options['menu']['type'] = 'tab';
 $handler->display->display_options['menu']['title'] = 'Assigned';
-$handler->display->display_options['menu']['weight'] = '0';
+$handler->display->display_options['menu']['weight'] = '10';
+$handler->display->display_options['menu']['name'] = 'user-menu';
 $handler->display->display_options['menu']['context'] = 0;
 
 /* Display: Rejected */
@@ -714,27 +712,23 @@ $handler->display->display_options['empty']['area']['empty'] = TRUE;
 $handler->display->display_options['empty']['area']['content'] = 'There are no rejected tasks.';
 $handler->display->display_options['empty']['area']['format'] = 'filtered_html';
 $handler->display->display_options['defaults']['relationships'] = FALSE;
-/* Relationship: Translation Management Local Task: Translation Job tjid */
+/* Relationship: Translation Task: Translation Job tjid */
 $handler->display->display_options['relationships']['job']['id'] = 'job';
 $handler->display->display_options['relationships']['job']['table'] = 'tmgmt_local_task';
 $handler->display->display_options['relationships']['job']['field'] = 'job';
 $handler->display->display_options['relationships']['job']['required'] = TRUE;
-/* Relationship: Translation Management Local Task: Translator tuid */
+/* Relationship: Translation Task: Translator tuid */
 $handler->display->display_options['relationships']['translator']['id'] = 'translator';
 $handler->display->display_options['relationships']['translator']['table'] = 'tmgmt_local_task';
 $handler->display->display_options['relationships']['translator']['field'] = 'translator';
 $handler->display->display_options['relationships']['translator']['label'] = 'Translator User';
 $handler->display->display_options['relationships']['translator']['required'] = TRUE;
 $handler->display->display_options['defaults']['fields'] = FALSE;
-/* Field: Translation Management Local Task: Status */
-$handler->display->display_options['fields']['status']['id'] = 'status';
-$handler->display->display_options['fields']['status']['table'] = 'tmgmt_local_task';
-$handler->display->display_options['fields']['status']['field'] = 'status';
-/* Field: Translation Management Local Task: Progress */
+/* Field: Translation Task: Progress */
 $handler->display->display_options['fields']['progress']['id'] = 'progress';
 $handler->display->display_options['fields']['progress']['table'] = 'tmgmt_local_task';
 $handler->display->display_options['fields']['progress']['field'] = 'progress';
-/* Field: Translation Management Local Task: Created */
+/* Field: Translation Task: Created */
 $handler->display->display_options['fields']['created']['id'] = 'created';
 $handler->display->display_options['fields']['created']['table'] = 'tmgmt_local_task';
 $handler->display->display_options['fields']['created']['field'] = 'created';
@@ -746,7 +740,7 @@ $handler->display->display_options['fields']['name']['table'] = 'users';
 $handler->display->display_options['fields']['name']['field'] = 'name';
 $handler->display->display_options['fields']['name']['relationship'] = 'translator';
 $handler->display->display_options['fields']['name']['label'] = 'Assignee';
-/* Field: Translation Management Local Task: Title */
+/* Field: Translation Task: Title */
 $handler->display->display_options['fields']['title']['id'] = 'title';
 $handler->display->display_options['fields']['title']['table'] = 'tmgmt_local_task';
 $handler->display->display_options['fields']['title']['field'] = 'title';
@@ -764,29 +758,28 @@ $handler->display->display_options['fields']['target_language']['field'] = 'targ
 $handler->display->display_options['fields']['target_language']['relationship'] = 'job';
 $handler->display->display_options['fields']['target_language']['label'] = 'Target language';
 $handler->display->display_options['fields']['target_language']['machine_name'] = TRUE;
-/* Field: Translation Management Local Task: Word count */
+/* Field: Translation Task: Word count */
 $handler->display->display_options['fields']['word_count']['id'] = 'word_count';
 $handler->display->display_options['fields']['word_count']['table'] = 'tmgmt_local_task';
 $handler->display->display_options['fields']['word_count']['field'] = 'word_count';
 $handler->display->display_options['fields']['word_count']['element_label_colon'] = FALSE;
-/* Field: Translation Management Local Task: Job item count */
+/* Field: Translation Task: Job item count */
 $handler->display->display_options['fields']['item_count']['id'] = 'item_count';
 $handler->display->display_options['fields']['item_count']['table'] = 'tmgmt_local_task';
 $handler->display->display_options['fields']['item_count']['field'] = 'item_count';
 $handler->display->display_options['fields']['item_count']['label'] = 'Item count';
-/* Field: Translation Management Local Task: Loop_count */
+/* Field: Translation Task: Loop_count */
 $handler->display->display_options['fields']['loop_count']['id'] = 'loop_count';
 $handler->display->display_options['fields']['loop_count']['table'] = 'tmgmt_local_task';
 $handler->display->display_options['fields']['loop_count']['field'] = 'loop_count';
 $handler->display->display_options['fields']['loop_count']['label'] = 'Loop count';
-/* Field: Translation Management Local Task: Manager View */
-$handler->display->display_options['fields']['view']['id'] = 'view';
-$handler->display->display_options['fields']['view']['table'] = 'tmgmt_local_task';
-$handler->display->display_options['fields']['view']['field'] = 'view';
-$handler->display->display_options['fields']['view']['label'] = 'Action';
+/* Field: Translation Task: Operations */
+$handler->display->display_options['fields']['operations']['id'] = 'operations';
+$handler->display->display_options['fields']['operations']['table'] = 'tmgmt_local_task';
+$handler->display->display_options['fields']['operations']['field'] = 'operations';
 $handler->display->display_options['defaults']['filter_groups'] = FALSE;
 $handler->display->display_options['defaults']['filters'] = FALSE;
-/* Filter criterion: Translation Management Local Task: Status */
+/* Filter criterion: Translation Task: Status */
 $handler->display->display_options['filters']['status']['id'] = 'status';
 $handler->display->display_options['filters']['status']['table'] = 'tmgmt_local_task';
 $handler->display->display_options['filters']['status']['field'] = 'status';
@@ -845,7 +838,7 @@ $handler->display->display_options['filters']['uid']['expose']['remember_roles']
   8 => 0,
   10 => 0,
 );
-/* Filter criterion: Translation Management Local Task: Title */
+/* Filter criterion: Translation Task: Title */
 $handler->display->display_options['filters']['title']['id'] = 'title';
 $handler->display->display_options['filters']['title']['table'] = 'tmgmt_local_task';
 $handler->display->display_options['filters']['title']['field'] = 'title';
@@ -862,9 +855,10 @@ $handler->display->display_options['filters']['title']['expose']['remember_roles
   10 => 0,
 );
 $handler->display->display_options['path'] = 'manage-translate/rejected';
-$handler->display->display_options['menu']['type'] = 'normal';
+$handler->display->display_options['menu']['type'] = 'tab';
 $handler->display->display_options['menu']['title'] = 'Rejected';
-$handler->display->display_options['menu']['weight'] = '1';
+$handler->display->display_options['menu']['weight'] = '20';
+$handler->display->display_options['menu']['name'] = 'user-menu';
 $handler->display->display_options['menu']['context'] = 0;
 
 /* Display: Pending */
@@ -945,19 +939,19 @@ $handler->display->display_options['empty']['area']['empty'] = TRUE;
 $handler->display->display_options['empty']['area']['content'] = 'There are no pending tasks.';
 $handler->display->display_options['empty']['area']['format'] = 'filtered_html';
 $handler->display->display_options['defaults']['relationships'] = FALSE;
-/* Relationship: Translation Management Local Task: Translation Job tjid */
+/* Relationship: Translation Task: Translation Job tjid */
 $handler->display->display_options['relationships']['job']['id'] = 'job';
 $handler->display->display_options['relationships']['job']['table'] = 'tmgmt_local_task';
 $handler->display->display_options['relationships']['job']['field'] = 'job';
 $handler->display->display_options['relationships']['job']['required'] = TRUE;
-/* Relationship: Translation Management Local Task: Translator tuid */
+/* Relationship: Translation Task: Translator tuid */
 $handler->display->display_options['relationships']['translator']['id'] = 'translator';
 $handler->display->display_options['relationships']['translator']['table'] = 'tmgmt_local_task';
 $handler->display->display_options['relationships']['translator']['field'] = 'translator';
 $handler->display->display_options['relationships']['translator']['label'] = 'Translator User';
 $handler->display->display_options['relationships']['translator']['required'] = TRUE;
 $handler->display->display_options['defaults']['fields'] = FALSE;
-/* Field: Bulk operations: Translation Management Local Task */
+/* Field: Bulk operations: Translation Task */
 $handler->display->display_options['fields']['views_bulk_operations']['id'] = 'views_bulk_operations';
 $handler->display->display_options['fields']['views_bulk_operations']['table'] = 'tmgmt_local_task';
 $handler->display->display_options['fields']['views_bulk_operations']['field'] = 'views_bulk_operations';
@@ -966,47 +960,45 @@ $handler->display->display_options['fields']['views_bulk_operations']['element_l
 $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']['display_result'] = 1;
 $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(
   'rules_component::rules_tmgmt_local_task_assign' => array(
     'selected' => 0,
-    'use_queue' => 0,
     'skip_confirmation' => 0,
     'override_label' => 0,
     'label' => '',
+    'postpone_processing' => 0,
   ),
   'rules_component::rules_tmgmt_local_task_assign_to_me' => array(
     'selected' => 0,
-    'use_queue' => 0,
     'skip_confirmation' => 1,
     'override_label' => 1,
     'label' => 'Assign to me',
+    '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::views_bulk_operations_modify_action' => array(
     'selected' => 0,
-    'use_queue' => 0,
     'skip_confirmation' => 0,
     'override_label' => 0,
     'label' => '',
@@ -1016,6 +1008,7 @@ $handler->display->display_options['fields']['views_bulk_operations']['vbo_opera
         '_all_' => '_all_',
       ),
     ),
+    'postpone_processing' => 0,
   ),
   'action::views_bulk_operations_argument_selector_action' => array(
     'selected' => 1,
@@ -1028,50 +1021,40 @@ $handler->display->display_options['fields']['views_bulk_operations']['vbo_opera
   ),
   'action::system_goto_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,
   ),
   'rules_component::rules_tmgmt_local_task_unassign' => array(
     'selected' => 0,
-    'use_queue' => 0,
     'skip_confirmation' => 0,
     'override_label' => 0,
     'label' => '',
+    'postpone_processing' => 0,
   ),
 );
-/* Field: Translation Management Local Task: Status */
-$handler->display->display_options['fields']['status']['id'] = 'status';
-$handler->display->display_options['fields']['status']['table'] = 'tmgmt_local_task';
-$handler->display->display_options['fields']['status']['field'] = 'status';
-/* Field: Translation Management Local Task: Progress */
-$handler->display->display_options['fields']['progress']['id'] = 'progress';
-$handler->display->display_options['fields']['progress']['table'] = 'tmgmt_local_task';
-$handler->display->display_options['fields']['progress']['field'] = 'progress';
-/* Field: Translation Management Local Task: Created */
-$handler->display->display_options['fields']['created']['id'] = 'created';
-$handler->display->display_options['fields']['created']['table'] = 'tmgmt_local_task';
-$handler->display->display_options['fields']['created']['field'] = 'created';
-$handler->display->display_options['fields']['created']['label'] = 'Date';
-$handler->display->display_options['fields']['created']['date_format'] = 'short';
 /* Field: User: Name */
 $handler->display->display_options['fields']['name']['id'] = 'name';
 $handler->display->display_options['fields']['name']['table'] = 'users';
 $handler->display->display_options['fields']['name']['field'] = 'name';
 $handler->display->display_options['fields']['name']['relationship'] = 'translator';
 $handler->display->display_options['fields']['name']['label'] = 'Assignee';
-/* Field: Translation Management Local Task: Title */
+/* Field: Translation Task: Title */
 $handler->display->display_options['fields']['title']['id'] = 'title';
 $handler->display->display_options['fields']['title']['table'] = 'tmgmt_local_task';
 $handler->display->display_options['fields']['title']['field'] = 'title';
+/* Field: Translation Task: Progress */
+$handler->display->display_options['fields']['progress']['id'] = 'progress';
+$handler->display->display_options['fields']['progress']['table'] = 'tmgmt_local_task';
+$handler->display->display_options['fields']['progress']['field'] = 'progress';
 /* Field: Translation Management Job: Source_language */
 $handler->display->display_options['fields']['source_language']['id'] = 'source_language';
 $handler->display->display_options['fields']['source_language']['table'] = 'tmgmt_job';
@@ -1086,29 +1069,28 @@ $handler->display->display_options['fields']['target_language']['field'] = 'targ
 $handler->display->display_options['fields']['target_language']['relationship'] = 'job';
 $handler->display->display_options['fields']['target_language']['label'] = 'Target language';
 $handler->display->display_options['fields']['target_language']['machine_name'] = TRUE;
-/* Field: Translation Management Local Task: Word count */
+/* Field: Translation Task: Word count */
 $handler->display->display_options['fields']['word_count']['id'] = 'word_count';
 $handler->display->display_options['fields']['word_count']['table'] = 'tmgmt_local_task';
 $handler->display->display_options['fields']['word_count']['field'] = 'word_count';
 $handler->display->display_options['fields']['word_count']['element_label_colon'] = FALSE;
-/* Field: Translation Management Local Task: Job item count */
+/* Field: Translation Task: Job item count */
 $handler->display->display_options['fields']['item_count']['id'] = 'item_count';
 $handler->display->display_options['fields']['item_count']['table'] = 'tmgmt_local_task';
 $handler->display->display_options['fields']['item_count']['field'] = 'item_count';
 $handler->display->display_options['fields']['item_count']['label'] = 'Item count';
-/* Field: Translation Management Local Task: Loop_count */
+/* Field: Translation Task: Loop_count */
 $handler->display->display_options['fields']['loop_count']['id'] = 'loop_count';
 $handler->display->display_options['fields']['loop_count']['table'] = 'tmgmt_local_task';
 $handler->display->display_options['fields']['loop_count']['field'] = 'loop_count';
 $handler->display->display_options['fields']['loop_count']['label'] = 'Loop count';
-/* Field: Translation Management Local Task: Manager View */
-$handler->display->display_options['fields']['view']['id'] = 'view';
-$handler->display->display_options['fields']['view']['table'] = 'tmgmt_local_task';
-$handler->display->display_options['fields']['view']['field'] = 'view';
-$handler->display->display_options['fields']['view']['label'] = 'Action';
+/* Field: Translation Task: Operations */
+$handler->display->display_options['fields']['operations']['id'] = 'operations';
+$handler->display->display_options['fields']['operations']['table'] = 'tmgmt_local_task';
+$handler->display->display_options['fields']['operations']['field'] = 'operations';
 $handler->display->display_options['defaults']['filter_groups'] = FALSE;
 $handler->display->display_options['defaults']['filters'] = FALSE;
-/* Filter criterion: Translation Management Local Task: Status */
+/* Filter criterion: Translation Task: Status */
 $handler->display->display_options['filters']['status']['id'] = 'status';
 $handler->display->display_options['filters']['status']['table'] = 'tmgmt_local_task';
 $handler->display->display_options['filters']['status']['field'] = 'status';
@@ -1167,7 +1149,7 @@ $handler->display->display_options['filters']['uid']['expose']['remember_roles']
   8 => 0,
   10 => 0,
 );
-/* Filter criterion: Translation Management Local Task: Title */
+/* Filter criterion: Translation Task: Title */
 $handler->display->display_options['filters']['title']['id'] = 'title';
 $handler->display->display_options['filters']['title']['table'] = 'tmgmt_local_task';
 $handler->display->display_options['filters']['title']['field'] = 'title';
@@ -1184,9 +1166,10 @@ $handler->display->display_options['filters']['title']['expose']['remember_roles
   10 => 0,
 );
 $handler->display->display_options['path'] = 'manage-translate/pending';
-$handler->display->display_options['menu']['type'] = 'normal';
+$handler->display->display_options['menu']['type'] = 'tab';
 $handler->display->display_options['menu']['title'] = 'Pending';
-$handler->display->display_options['menu']['weight'] = '2';
+$handler->display->display_options['menu']['weight'] = '30';
+$handler->display->display_options['menu']['name'] = 'user-menu';
 $handler->display->display_options['menu']['context'] = 0;
 
 /* Display: Completed */
@@ -1267,27 +1250,27 @@ $handler->display->display_options['empty']['area']['empty'] = TRUE;
 $handler->display->display_options['empty']['area']['content'] = 'There are no completed tasks.';
 $handler->display->display_options['empty']['area']['format'] = 'filtered_html';
 $handler->display->display_options['defaults']['relationships'] = FALSE;
-/* Relationship: Translation Management Local Task: Translation Job tjid */
+/* Relationship: Translation Task: Translation Job tjid */
 $handler->display->display_options['relationships']['job']['id'] = 'job';
 $handler->display->display_options['relationships']['job']['table'] = 'tmgmt_local_task';
 $handler->display->display_options['relationships']['job']['field'] = 'job';
 $handler->display->display_options['relationships']['job']['required'] = TRUE;
-/* Relationship: Translation Management Local Task: Translator tuid */
+/* Relationship: Translation Task: Translator tuid */
 $handler->display->display_options['relationships']['translator']['id'] = 'translator';
 $handler->display->display_options['relationships']['translator']['table'] = 'tmgmt_local_task';
 $handler->display->display_options['relationships']['translator']['field'] = 'translator';
 $handler->display->display_options['relationships']['translator']['label'] = 'Translator User';
 $handler->display->display_options['relationships']['translator']['required'] = TRUE;
 $handler->display->display_options['defaults']['fields'] = FALSE;
-/* Field: Translation Management Local Task: Status */
+/* Field: Translation Task: Status */
 $handler->display->display_options['fields']['status']['id'] = 'status';
 $handler->display->display_options['fields']['status']['table'] = 'tmgmt_local_task';
 $handler->display->display_options['fields']['status']['field'] = 'status';
-/* Field: Translation Management Local Task: Progress */
+/* Field: Translation Task: Progress */
 $handler->display->display_options['fields']['progress']['id'] = 'progress';
 $handler->display->display_options['fields']['progress']['table'] = 'tmgmt_local_task';
 $handler->display->display_options['fields']['progress']['field'] = 'progress';
-/* Field: Translation Management Local Task: Created */
+/* Field: Translation Task: Created */
 $handler->display->display_options['fields']['created']['id'] = 'created';
 $handler->display->display_options['fields']['created']['table'] = 'tmgmt_local_task';
 $handler->display->display_options['fields']['created']['field'] = 'created';
@@ -1299,7 +1282,7 @@ $handler->display->display_options['fields']['name']['table'] = 'users';
 $handler->display->display_options['fields']['name']['field'] = 'name';
 $handler->display->display_options['fields']['name']['relationship'] = 'translator';
 $handler->display->display_options['fields']['name']['label'] = 'Assignee';
-/* Field: Translation Management Local Task: Title */
+/* Field: Translation Task: Title */
 $handler->display->display_options['fields']['title']['id'] = 'title';
 $handler->display->display_options['fields']['title']['table'] = 'tmgmt_local_task';
 $handler->display->display_options['fields']['title']['field'] = 'title';
@@ -1317,29 +1300,28 @@ $handler->display->display_options['fields']['target_language']['field'] = 'targ
 $handler->display->display_options['fields']['target_language']['relationship'] = 'job';
 $handler->display->display_options['fields']['target_language']['label'] = 'Target language';
 $handler->display->display_options['fields']['target_language']['machine_name'] = TRUE;
-/* Field: Translation Management Local Task: Word count */
+/* Field: Translation Task: Word count */
 $handler->display->display_options['fields']['word_count']['id'] = 'word_count';
 $handler->display->display_options['fields']['word_count']['table'] = 'tmgmt_local_task';
 $handler->display->display_options['fields']['word_count']['field'] = 'word_count';
 $handler->display->display_options['fields']['word_count']['element_label_colon'] = FALSE;
-/* Field: Translation Management Local Task: Job item count */
+/* Field: Translation Task: Job item count */
 $handler->display->display_options['fields']['item_count']['id'] = 'item_count';
 $handler->display->display_options['fields']['item_count']['table'] = 'tmgmt_local_task';
 $handler->display->display_options['fields']['item_count']['field'] = 'item_count';
 $handler->display->display_options['fields']['item_count']['label'] = 'Item count';
-/* Field: Translation Management Local Task: Loop_count */
+/* Field: Translation Task: Loop_count */
 $handler->display->display_options['fields']['loop_count']['id'] = 'loop_count';
 $handler->display->display_options['fields']['loop_count']['table'] = 'tmgmt_local_task';
 $handler->display->display_options['fields']['loop_count']['field'] = 'loop_count';
 $handler->display->display_options['fields']['loop_count']['label'] = 'Loop count';
-/* Field: Translation Management Local Task: Manager View */
-$handler->display->display_options['fields']['view']['id'] = 'view';
-$handler->display->display_options['fields']['view']['table'] = 'tmgmt_local_task';
-$handler->display->display_options['fields']['view']['field'] = 'view';
-$handler->display->display_options['fields']['view']['label'] = 'Action';
+/* Field: Translation Task: Operations */
+$handler->display->display_options['fields']['operations']['id'] = 'operations';
+$handler->display->display_options['fields']['operations']['table'] = 'tmgmt_local_task';
+$handler->display->display_options['fields']['operations']['field'] = 'operations';
 $handler->display->display_options['defaults']['filter_groups'] = FALSE;
 $handler->display->display_options['defaults']['filters'] = FALSE;
-/* Filter criterion: Translation Management Local Task: Status */
+/* Filter criterion: Translation Task: Status */
 $handler->display->display_options['filters']['status']['id'] = 'status';
 $handler->display->display_options['filters']['status']['table'] = 'tmgmt_local_task';
 $handler->display->display_options['filters']['status']['field'] = 'status';
@@ -1398,7 +1380,7 @@ $handler->display->display_options['filters']['uid']['expose']['remember_roles']
   8 => 0,
   10 => 0,
 );
-/* Filter criterion: Translation Management Local Task: Title */
+/* Filter criterion: Translation Task: Title */
 $handler->display->display_options['filters']['title']['id'] = 'title';
 $handler->display->display_options['filters']['title']['table'] = 'tmgmt_local_task';
 $handler->display->display_options['filters']['title']['field'] = 'title';
@@ -1415,9 +1397,10 @@ $handler->display->display_options['filters']['title']['expose']['remember_roles
   10 => 0,
 );
 $handler->display->display_options['path'] = 'manage-translate/completed';
-$handler->display->display_options['menu']['type'] = 'normal';
+$handler->display->display_options['menu']['type'] = 'tab';
 $handler->display->display_options['menu']['title'] = 'Completed';
-$handler->display->display_options['menu']['weight'] = '3';
+$handler->display->display_options['menu']['weight'] = '40';
+$handler->display->display_options['menu']['name'] = 'user-menu';
 $handler->display->display_options['menu']['context'] = 0;
 
 /* Display: Closed */
@@ -1498,27 +1481,27 @@ $handler->display->display_options['empty']['area']['empty'] = TRUE;
 $handler->display->display_options['empty']['area']['content'] = 'There are no closed tasks.';
 $handler->display->display_options['empty']['area']['format'] = 'filtered_html';
 $handler->display->display_options['defaults']['relationships'] = FALSE;
-/* Relationship: Translation Management Local Task: Translation Job tjid */
+/* Relationship: Translation Task: Translation Job tjid */
 $handler->display->display_options['relationships']['job']['id'] = 'job';
 $handler->display->display_options['relationships']['job']['table'] = 'tmgmt_local_task';
 $handler->display->display_options['relationships']['job']['field'] = 'job';
 $handler->display->display_options['relationships']['job']['required'] = TRUE;
-/* Relationship: Translation Management Local Task: Translator tuid */
+/* Relationship: Translation Task: Translator tuid */
 $handler->display->display_options['relationships']['translator']['id'] = 'translator';
 $handler->display->display_options['relationships']['translator']['table'] = 'tmgmt_local_task';
 $handler->display->display_options['relationships']['translator']['field'] = 'translator';
 $handler->display->display_options['relationships']['translator']['label'] = 'Translator User';
 $handler->display->display_options['relationships']['translator']['required'] = TRUE;
 $handler->display->display_options['defaults']['fields'] = FALSE;
-/* Field: Translation Management Local Task: Status */
+/* Field: Translation Task: Status */
 $handler->display->display_options['fields']['status']['id'] = 'status';
 $handler->display->display_options['fields']['status']['table'] = 'tmgmt_local_task';
 $handler->display->display_options['fields']['status']['field'] = 'status';
-/* Field: Translation Management Local Task: Progress */
+/* Field: Translation Task: Progress */
 $handler->display->display_options['fields']['progress']['id'] = 'progress';
 $handler->display->display_options['fields']['progress']['table'] = 'tmgmt_local_task';
 $handler->display->display_options['fields']['progress']['field'] = 'progress';
-/* Field: Translation Management Local Task: Created */
+/* Field: Translation Task: Created */
 $handler->display->display_options['fields']['created']['id'] = 'created';
 $handler->display->display_options['fields']['created']['table'] = 'tmgmt_local_task';
 $handler->display->display_options['fields']['created']['field'] = 'created';
@@ -1530,7 +1513,7 @@ $handler->display->display_options['fields']['name']['table'] = 'users';
 $handler->display->display_options['fields']['name']['field'] = 'name';
 $handler->display->display_options['fields']['name']['relationship'] = 'translator';
 $handler->display->display_options['fields']['name']['label'] = 'Assignee';
-/* Field: Translation Management Local Task: Title */
+/* Field: Translation Task: Title */
 $handler->display->display_options['fields']['title']['id'] = 'title';
 $handler->display->display_options['fields']['title']['table'] = 'tmgmt_local_task';
 $handler->display->display_options['fields']['title']['field'] = 'title';
@@ -1548,29 +1531,28 @@ $handler->display->display_options['fields']['target_language']['field'] = 'targ
 $handler->display->display_options['fields']['target_language']['relationship'] = 'job';
 $handler->display->display_options['fields']['target_language']['label'] = 'Target language';
 $handler->display->display_options['fields']['target_language']['machine_name'] = TRUE;
-/* Field: Translation Management Local Task: Word count */
+/* Field: Translation Task: Word count */
 $handler->display->display_options['fields']['word_count']['id'] = 'word_count';
 $handler->display->display_options['fields']['word_count']['table'] = 'tmgmt_local_task';
 $handler->display->display_options['fields']['word_count']['field'] = 'word_count';
 $handler->display->display_options['fields']['word_count']['element_label_colon'] = FALSE;
-/* Field: Translation Management Local Task: Job item count */
+/* Field: Translation Task: Job item count */
 $handler->display->display_options['fields']['item_count']['id'] = 'item_count';
 $handler->display->display_options['fields']['item_count']['table'] = 'tmgmt_local_task';
 $handler->display->display_options['fields']['item_count']['field'] = 'item_count';
 $handler->display->display_options['fields']['item_count']['label'] = 'Item count';
-/* Field: Translation Management Local Task: Loop_count */
+/* Field: Translation Task: Loop_count */
 $handler->display->display_options['fields']['loop_count']['id'] = 'loop_count';
 $handler->display->display_options['fields']['loop_count']['table'] = 'tmgmt_local_task';
 $handler->display->display_options['fields']['loop_count']['field'] = 'loop_count';
 $handler->display->display_options['fields']['loop_count']['label'] = 'Loop count';
-/* Field: Translation Management Local Task: Manager View */
-$handler->display->display_options['fields']['view']['id'] = 'view';
-$handler->display->display_options['fields']['view']['table'] = 'tmgmt_local_task';
-$handler->display->display_options['fields']['view']['field'] = 'view';
-$handler->display->display_options['fields']['view']['label'] = 'Action';
+/* Field: Translation Task: Operations */
+$handler->display->display_options['fields']['operations']['id'] = 'operations';
+$handler->display->display_options['fields']['operations']['table'] = 'tmgmt_local_task';
+$handler->display->display_options['fields']['operations']['field'] = 'operations';
 $handler->display->display_options['defaults']['filter_groups'] = FALSE;
 $handler->display->display_options['defaults']['filters'] = FALSE;
-/* Filter criterion: Translation Management Local Task: Status */
+/* Filter criterion: Translation Task: Status */
 $handler->display->display_options['filters']['status']['id'] = 'status';
 $handler->display->display_options['filters']['status']['table'] = 'tmgmt_local_task';
 $handler->display->display_options['filters']['status']['field'] = 'status';
@@ -1629,7 +1611,7 @@ $handler->display->display_options['filters']['uid']['expose']['remember_roles']
   8 => 0,
   10 => 0,
 );
-/* Filter criterion: Translation Management Local Task: Title */
+/* Filter criterion: Translation Task: Title */
 $handler->display->display_options['filters']['title']['id'] = 'title';
 $handler->display->display_options['filters']['title']['table'] = 'tmgmt_local_task';
 $handler->display->display_options['filters']['title']['field'] = 'title';
@@ -1646,9 +1628,10 @@ $handler->display->display_options['filters']['title']['expose']['remember_roles
   10 => 0,
 );
 $handler->display->display_options['path'] = 'manage-translate/closed';
-$handler->display->display_options['menu']['type'] = 'normal';
+$handler->display->display_options['menu']['type'] = 'tab';
 $handler->display->display_options['menu']['title'] = 'Closed';
-$handler->display->display_options['menu']['weight'] = '4';
+$handler->display->display_options['menu']['weight'] = '50';
+$handler->display->display_options['menu']['name'] = 'user-menu';
 $handler->display->display_options['menu']['context'] = 0;
 $translatables['tmgmt_local_manage_translate_task'] = array(
   t('Master'),
@@ -1672,22 +1655,21 @@ $translatables['tmgmt_local_manage_translate_task'] = array(
   t('Job item count'),
   t('Progress'),
   t('Main'),
-  t('Unassigned Tasks'),
+  t('Manage Translation Tasks'),
   t('Shows main view elegible (unasigned) tasks and assigned.'),
   t('Empty message'),
   t('There are no unassigned tasks.'),
-  t('Date'),
   t('Language'),
   t('Target language'),
   t('Item count'),
   t('Loop count'),
   t('.'),
   t(','),
-  t('Action'),
+  t('Operations'),
   t('Assigned'),
   t('Assigned Tasks'),
   t('Shows asigned tasks.'),
-  t('Translator User'),
+  t('Translator'),
   t('Status'),
   t('Assignee'),
   t('Language from'),
@@ -1697,6 +1679,8 @@ $translatables['tmgmt_local_manage_translate_task'] = array(
   t('Rejected Tasks'),
   t('Shows asigned tasks with rejected status.'),
   t('There are no rejected tasks.'),
+  t('Translator User'),
+  t('Date'),
   t('Pending'),
   t('Pending Tasks'),
   t('Shows asigned tasks with pending status.'),
diff --git a/translators/tmgmt_local/views/tmgmt_local_task_items.view.inc b/translators/tmgmt_local/views/tmgmt_local_task_items.view.inc
new file mode 100644
index 0000000..18feb5a
--- /dev/null
+++ b/translators/tmgmt_local/views/tmgmt_local_task_items.view.inc
@@ -0,0 +1,82 @@
+<?php
+
+$view = new view();
+$view->name = 'tmgmt_local_task_items';
+$view->description = '';
+$view->tag = 'default';
+$view->base_table = 'tmgmt_local_task_item';
+$view->human_name = 'Translation Task Items';
+$view->core = 7;
+$view->api_version = '3.0';
+$view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
+
+/* Display: Master */
+$handler = $view->new_display('default', 'Master', 'default');
+$handler->display->display_options['title'] = 'Translation Task Items';
+$handler->display->display_options['use_more_always'] = FALSE;
+$handler->display->display_options['access']['type'] = 'none';
+$handler->display->display_options['cache']['type'] = 'none';
+$handler->display->display_options['query']['type'] = 'views_query';
+$handler->display->display_options['exposed_form']['type'] = 'basic';
+$handler->display->display_options['pager']['type'] = 'full';
+$handler->display->display_options['pager']['options']['items_per_page'] = '20';
+$handler->display->display_options['style_plugin'] = 'table';
+/* Relationship: Translation Task Item: Tltid */
+$handler->display->display_options['relationships']['tltid']['id'] = 'tltid';
+$handler->display->display_options['relationships']['tltid']['table'] = 'tmgmt_local_task_item';
+$handler->display->display_options['relationships']['tltid']['field'] = 'tltid';
+/* Relationship: Translation Task Item: Tjiid */
+$handler->display->display_options['relationships']['tjiid']['id'] = 'tjiid';
+$handler->display->display_options['relationships']['tjiid']['table'] = 'tmgmt_local_task_item';
+$handler->display->display_options['relationships']['tjiid']['field'] = 'tjiid';
+/* Field: Translation Management Job Item: Label */
+$handler->display->display_options['fields']['label']['id'] = 'label';
+$handler->display->display_options['fields']['label']['table'] = 'tmgmt_job_item';
+$handler->display->display_options['fields']['label']['field'] = 'label';
+$handler->display->display_options['fields']['label']['relationship'] = 'tjiid';
+/* Field: Translation Task Item: Status */
+$handler->display->display_options['fields']['status']['id'] = 'status';
+$handler->display->display_options['fields']['status']['table'] = 'tmgmt_local_task_item';
+$handler->display->display_options['fields']['status']['field'] = 'status';
+/* Field: Translation Task Item: Operations */
+$handler->display->display_options['fields']['operations']['id'] = 'operations';
+$handler->display->display_options['fields']['operations']['table'] = 'tmgmt_local_task_item';
+$handler->display->display_options['fields']['operations']['field'] = 'operations';
+/* Contextual filter: Translation Task Item: Tltid */
+$handler->display->display_options['arguments']['tltid']['id'] = 'tltid';
+$handler->display->display_options['arguments']['tltid']['table'] = 'tmgmt_local_task_item';
+$handler->display->display_options['arguments']['tltid']['field'] = 'tltid';
+$handler->display->display_options['arguments']['tltid']['default_action'] = 'empty';
+$handler->display->display_options['arguments']['tltid']['default_argument_type'] = 'fixed';
+$handler->display->display_options['arguments']['tltid']['summary']['number_of_records'] = '0';
+$handler->display->display_options['arguments']['tltid']['summary']['format'] = 'default_summary';
+$handler->display->display_options['arguments']['tltid']['summary_options']['items_per_page'] = '25';
+
+/* Display: Block */
+$handler = $view->new_display('block', 'Block', 'block');
+$handler->display->display_options['defaults']['hide_admin_links'] = FALSE;
+$translatables['tmgmt_local_task_items'] = array(
+  t('Master'),
+  t('Translation Task Items'),
+  t('more'),
+  t('Apply'),
+  t('Reset'),
+  t('Sort by'),
+  t('Asc'),
+  t('Desc'),
+  t('Items per page'),
+  t('- All -'),
+  t('Offset'),
+  t('« first'),
+  t('‹ previous'),
+  t('next ›'),
+  t('last »'),
+  t('Translation Task'),
+  t('Translation Management Job Item'),
+  t('Label'),
+  t('Status'),
+  t('Operations'),
+  t('All'),
+  t('Block'),
+);
+
diff --git a/translators/tmgmt_local/views/tmgmt_local_task_overview.view.inc b/translators/tmgmt_local/views/tmgmt_local_task_overview.view.inc
index 3d3bd36..fddc7f3 100644
--- a/translators/tmgmt_local/views/tmgmt_local_task_overview.view.inc
+++ b/translators/tmgmt_local/views/tmgmt_local_task_overview.view.inc
@@ -26,6 +26,11 @@ $handler->display->display_options['style_plugin'] = 'table';
 $handler->display->display_options['relationships']['job']['id'] = 'job';
 $handler->display->display_options['relationships']['job']['table'] = 'tmgmt_local_task';
 $handler->display->display_options['relationships']['job']['field'] = 'job';
+/* Relationship: Translation Task: Translator tuid */
+$handler->display->display_options['relationships']['translator']['id'] = 'translator';
+$handler->display->display_options['relationships']['translator']['table'] = 'tmgmt_local_task';
+$handler->display->display_options['relationships']['translator']['field'] = 'translator';
+$handler->display->display_options['relationships']['translator']['label'] = 'Assigned Translator';
 /* Field: Bulk operations: Translation Task */
 $handler->display->display_options['fields']['views_bulk_operations']['id'] = 'views_bulk_operations';
 $handler->display->display_options['fields']['views_bulk_operations']['table'] = 'tmgmt_local_task';
@@ -35,47 +40,45 @@ $handler->display->display_options['fields']['views_bulk_operations']['element_l
 $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']['display_result'] = 1;
 $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(
   'rules_component::rules_tmgmt_local_task_assign1' => array(
     'selected' => 0,
-    'use_queue' => 0,
     'skip_confirmation' => 0,
     'override_label' => 0,
     'label' => '',
+    'postpone_processing' => 0,
   ),
   'rules_component::rules_tmgmt_local_task_assign' => array(
     'selected' => 0,
-    'use_queue' => 0,
     'skip_confirmation' => 0,
     'override_label' => 0,
     'label' => '',
+    'postpone_processing' => 0,
   ),
   'action::views_bulk_operations_delete_item' => array(
     'selected' => 1,
-    '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::views_bulk_operations_modify_action' => array(
     'selected' => 0,
-    'use_queue' => 0,
     'skip_confirmation' => 0,
     'override_label' => 0,
     'label' => '',
@@ -85,6 +88,7 @@ $handler->display->display_options['fields']['views_bulk_operations']['vbo_opera
         '_all_' => '_all_',
       ),
     ),
+    'postpone_processing' => 0,
   ),
   'action::views_bulk_operations_argument_selector_action' => array(
     'selected' => 0,
@@ -97,31 +101,31 @@ $handler->display->display_options['fields']['views_bulk_operations']['vbo_opera
   ),
   'action::system_goto_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,
   ),
   'rules_component::rules_test' => array(
     'selected' => 0,
-    'use_queue' => 0,
     'skip_confirmation' => 0,
     'override_label' => 0,
     'label' => '',
+    'postpone_processing' => 0,
   ),
   'rules_component::rules_tmgmt_local_task_assign_to_me' => array(
     'selected' => 0,
-    'use_queue' => 0,
     'skip_confirmation' => 1,
     'override_label' => 1,
     'label' => 'Assign to me',
+    'postpone_processing' => 0,
   ),
 );
 /* Field: Translation Task: Title */
@@ -141,143 +145,28 @@ $handler->display->display_options['fields']['item_count']['field'] = 'item_coun
 $handler->display->display_options['fields']['progress']['id'] = 'progress';
 $handler->display->display_options['fields']['progress']['table'] = 'tmgmt_local_task';
 $handler->display->display_options['fields']['progress']['field'] = 'progress';
-
-/* Display: Admin Overview */
-$handler = $view->new_display('page', 'Admin Overview', 'admin_overview');
-$handler->display->display_options['defaults']['hide_admin_links'] = FALSE;
-$handler->display->display_options['defaults']['fields'] = FALSE;
-/* Field: Bulk operations: Translation Task */
-$handler->display->display_options['fields']['views_bulk_operations']['id'] = 'views_bulk_operations';
-$handler->display->display_options['fields']['views_bulk_operations']['table'] = 'tmgmt_local_task';
-$handler->display->display_options['fields']['views_bulk_operations']['field'] = 'views_bulk_operations';
-$handler->display->display_options['fields']['views_bulk_operations']['label'] = '';
-$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']['display_result'] = 1;
-$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(
-  'rules_component::rules_tmgmt_local_task_assign1' => array(
-    'selected' => 0,
-    'use_queue' => 0,
-    'skip_confirmation' => 0,
-    'override_label' => 0,
-    'label' => '',
-  ),
-  'rules_component::rules_tmgmt_local_task_assign' => array(
-    'selected' => 0,
-    'use_queue' => 0,
-    'skip_confirmation' => 0,
-    'override_label' => 0,
-    'label' => '',
-  ),
-  'rules_component::rules_tmgmt_local_task_assign_to_me' => array(
-    'selected' => 0,
-    'use_queue' => 0,
-    'skip_confirmation' => 1,
-    'override_label' => 1,
-    'label' => 'Assign to me',
-  ),
-  'action::views_bulk_operations_delete_item' => array(
-    'selected' => 1,
-    'use_queue' => 0,
-    'skip_confirmation' => 1,
-    'override_label' => 0,
-    'label' => '',
-  ),
-  'action::system_message_action' => array(
-    'selected' => 0,
-    'use_queue' => 0,
-    'skip_confirmation' => 0,
-    'override_label' => 0,
-    'label' => '',
-  ),
-  'action::views_bulk_operations_script_action' => array(
-    'selected' => 0,
-    'use_queue' => 0,
-    'skip_confirmation' => 0,
-    'override_label' => 0,
-    'label' => '',
-  ),
-  'action::views_bulk_operations_modify_action' => array(
-    'selected' => 0,
-    'use_queue' => 0,
-    'skip_confirmation' => 0,
-    'override_label' => 0,
-    'label' => '',
-    'settings' => array(
-      'show_all_tokens' => 1,
-      'display_values' => array(
-        '_all_' => '_all_',
-      ),
-    ),
-  ),
-  'action::views_bulk_operations_argument_selector_action' => array(
-    'selected' => 0,
-    'skip_confirmation' => 0,
-    'override_label' => 0,
-    'label' => '',
-    'settings' => array(
-      'url' => '',
-    ),
-  ),
-  'action::system_goto_action' => array(
-    'selected' => 0,
-    'use_queue' => 0,
-    'skip_confirmation' => 0,
-    'override_label' => 0,
-    'label' => '',
-  ),
-  'action::system_send_email_action' => array(
-    'selected' => 0,
-    'use_queue' => 0,
-    'skip_confirmation' => 0,
-    'override_label' => 0,
-    'label' => '',
-  ),
-  'rules_component::rules_test' => array(
-    'selected' => 0,
-    'use_queue' => 0,
-    'skip_confirmation' => 0,
-    'override_label' => 0,
-    'label' => '',
-  ),
-  'rules_component::rules_tmgmt_local_task_unassign' => array(
-    'selected' => 0,
-    'use_queue' => 0,
-    'skip_confirmation' => 0,
-    'override_label' => 0,
-    'label' => '',
-  ),
+/* Filter criterion: Translation Task: Status */
+$handler->display->display_options['filters']['status']['id'] = 'status';
+$handler->display->display_options['filters']['status']['table'] = 'tmgmt_local_task';
+$handler->display->display_options['filters']['status']['field'] = 'status';
+$handler->display->display_options['filters']['status']['exposed'] = TRUE;
+$handler->display->display_options['filters']['status']['expose']['operator_id'] = 'status_op';
+$handler->display->display_options['filters']['status']['expose']['label'] = 'Status';
+$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']['remember_roles'] = array(
+  2 => '2',
+  1 => 0,
+  3 => 0,
+  4 => 0,
+  5 => 0,
+  6 => 0,
 );
-/* Field: Translation Task: Title */
-$handler->display->display_options['fields']['title']['id'] = 'title';
-$handler->display->display_options['fields']['title']['table'] = 'tmgmt_local_task';
-$handler->display->display_options['fields']['title']['field'] = 'title';
-/* Field: Translation Task: Word count */
-$handler->display->display_options['fields']['word_count']['id'] = 'word_count';
-$handler->display->display_options['fields']['word_count']['table'] = 'tmgmt_local_task';
-$handler->display->display_options['fields']['word_count']['field'] = 'word_count';
-$handler->display->display_options['fields']['word_count']['element_label_colon'] = FALSE;
-/* Field: Translation Task: Job item count */
-$handler->display->display_options['fields']['item_count']['id'] = 'item_count';
-$handler->display->display_options['fields']['item_count']['table'] = 'tmgmt_local_task';
-$handler->display->display_options['fields']['item_count']['field'] = 'item_count';
-/* Field: Translation Task: Progress */
-$handler->display->display_options['fields']['progress']['id'] = 'progress';
-$handler->display->display_options['fields']['progress']['table'] = 'tmgmt_local_task';
-$handler->display->display_options['fields']['progress']['field'] = 'progress';
-$handler->display->display_options['path'] = 'admin/config/regional/tmgmt/local-tasks';
-$handler->display->display_options['menu']['type'] = 'tab';
-$handler->display->display_options['menu']['title'] = 'Local Tasks';
-$handler->display->display_options['menu']['weight'] = '0';
-$handler->display->display_options['menu']['context'] = 0;
 
 /* Display: Unassigned and mine */
 $handler = $view->new_display('page', 'Unassigned and mine', 'unassigned');
 $handler->display->display_options['defaults']['title'] = FALSE;
-$handler->display->display_options['title'] = 'Unassigned Eligible Tasks';
+$handler->display->display_options['title'] = 'Translate';
 $handler->display->display_options['display_description'] = 'Shows elegible (unasigned) and mine tasks.';
 $handler->display->display_options['defaults']['hide_admin_links'] = FALSE;
 $handler->display->display_options['defaults']['style_plugin'] = FALSE;
@@ -379,47 +268,45 @@ $handler->display->display_options['fields']['views_bulk_operations']['element_l
 $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']['display_result'] = 1;
 $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(
   'rules_component::rules_tmgmt_local_task_assign1' => array(
     'selected' => 0,
-    'use_queue' => 0,
     'skip_confirmation' => 0,
     'override_label' => 0,
     'label' => '',
+    'postpone_processing' => 0,
   ),
   'rules_component::rules_tmgmt_local_task_assign' => 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::views_bulk_operations_modify_action' => array(
     'selected' => 0,
-    'use_queue' => 0,
     'skip_confirmation' => 0,
     'override_label' => 0,
     'label' => '',
@@ -429,6 +316,7 @@ $handler->display->display_options['fields']['views_bulk_operations']['vbo_opera
         '_all_' => '_all_',
       ),
     ),
+    'postpone_processing' => 0,
   ),
   'action::views_bulk_operations_argument_selector_action' => array(
     'selected' => 0,
@@ -441,39 +329,33 @@ $handler->display->display_options['fields']['views_bulk_operations']['vbo_opera
   ),
   'action::system_goto_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,
   ),
   'rules_component::rules_test' => array(
     'selected' => 0,
-    'use_queue' => 0,
     'skip_confirmation' => 0,
     'override_label' => 0,
     'label' => '',
+    'postpone_processing' => 0,
   ),
   'rules_component::rules_tmgmt_local_task_assign_to_me' => array(
     'selected' => 1,
-    'use_queue' => 0,
     'skip_confirmation' => 1,
     'override_label' => 1,
     'label' => 'Assign to me',
+    'postpone_processing' => 0,
   ),
 );
-/* Field: Translation Task: Created */
-$handler->display->display_options['fields']['created']['id'] = 'created';
-$handler->display->display_options['fields']['created']['table'] = 'tmgmt_local_task';
-$handler->display->display_options['fields']['created']['field'] = 'created';
-$handler->display->display_options['fields']['created']['label'] = 'Date';
-$handler->display->display_options['fields']['created']['date_format'] = 'short';
 /* Field: Translation Task: Title */
 $handler->display->display_options['fields']['title']['id'] = 'title';
 $handler->display->display_options['fields']['title']['table'] = 'tmgmt_local_task';
@@ -502,16 +384,10 @@ $handler->display->display_options['fields']['item_count']['id'] = 'item_count';
 $handler->display->display_options['fields']['item_count']['table'] = 'tmgmt_local_task';
 $handler->display->display_options['fields']['item_count']['field'] = 'item_count';
 $handler->display->display_options['fields']['item_count']['label'] = 'Item count';
-/* Field: Translation Task: Assign to me */
-$handler->display->display_options['fields']['assign_to_me']['id'] = 'assign_to_me';
-$handler->display->display_options['fields']['assign_to_me']['table'] = 'tmgmt_local_task';
-$handler->display->display_options['fields']['assign_to_me']['field'] = 'assign_to_me';
-$handler->display->display_options['fields']['assign_to_me']['label'] = 'Action';
-$handler->display->display_options['fields']['assign_to_me']['alter']['word_boundary'] = FALSE;
-$handler->display->display_options['fields']['assign_to_me']['alter']['ellipsis'] = FALSE;
-$handler->display->display_options['fields']['assign_to_me']['element_label_colon'] = FALSE;
-$handler->display->display_options['fields']['assign_to_me']['element_default_classes'] = FALSE;
-$handler->display->display_options['fields']['assign_to_me']['hide_alter_empty'] = FALSE;
+/* Field: Translation Task: Operations */
+$handler->display->display_options['fields']['operations']['id'] = 'operations';
+$handler->display->display_options['fields']['operations']['table'] = 'tmgmt_local_task';
+$handler->display->display_options['fields']['operations']['field'] = 'operations';
 $handler->display->display_options['defaults']['filter_groups'] = FALSE;
 $handler->display->display_options['defaults']['filters'] = FALSE;
 /* Filter criterion: Translation Task: Status */
@@ -526,11 +402,14 @@ $handler->display->display_options['filters']['eligible']['id'] = 'eligible';
 $handler->display->display_options['filters']['eligible']['table'] = 'tmgmt_job';
 $handler->display->display_options['filters']['eligible']['field'] = 'eligible';
 $handler->display->display_options['filters']['eligible']['relationship'] = 'job';
-$handler->display->display_options['path'] = 'translate';
-$handler->display->display_options['menu']['type'] = 'normal';
-$handler->display->display_options['menu']['title'] = 'Translate';
+$handler->display->display_options['path'] = 'translate/default';
+$handler->display->display_options['menu']['type'] = 'default tab';
+$handler->display->display_options['menu']['title'] = 'Unassigned and mine';
 $handler->display->display_options['menu']['weight'] = '0';
 $handler->display->display_options['menu']['context'] = 0;
+$handler->display->display_options['tab_options']['type'] = 'normal';
+$handler->display->display_options['tab_options']['title'] = 'Translate';
+$handler->display->display_options['tab_options']['weight'] = '0';
 
 /* Display: Elegible */
 $handler = $view->new_display('page', 'Elegible', 'eligible');
@@ -625,47 +504,45 @@ $handler->display->display_options['fields']['views_bulk_operations']['element_l
 $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']['display_result'] = 1;
 $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(
   'rules_component::rules_tmgmt_local_task_assign1' => array(
     'selected' => 0,
-    'use_queue' => 0,
     'skip_confirmation' => 0,
     'override_label' => 0,
     'label' => '',
+    'postpone_processing' => 0,
   ),
   'rules_component::rules_tmgmt_local_task_assign' => 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::views_bulk_operations_modify_action' => array(
     'selected' => 0,
-    'use_queue' => 0,
     'skip_confirmation' => 0,
     'override_label' => 0,
     'label' => '',
@@ -675,6 +552,7 @@ $handler->display->display_options['fields']['views_bulk_operations']['vbo_opera
         '_all_' => '_all_',
       ),
     ),
+    'postpone_processing' => 0,
   ),
   'action::views_bulk_operations_argument_selector_action' => array(
     'selected' => 0,
@@ -687,39 +565,33 @@ $handler->display->display_options['fields']['views_bulk_operations']['vbo_opera
   ),
   'action::system_goto_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,
   ),
   'rules_component::rules_test' => array(
     'selected' => 0,
-    'use_queue' => 0,
     'skip_confirmation' => 0,
     'override_label' => 0,
     'label' => '',
+    'postpone_processing' => 0,
   ),
   'rules_component::rules_tmgmt_local_task_assign_to_me' => array(
     'selected' => 1,
-    'use_queue' => 0,
     'skip_confirmation' => 1,
     'override_label' => 1,
     'label' => 'Assign to me',
+    'postpone_processing' => 0,
   ),
 );
-/* Field: Translation Task: Created */
-$handler->display->display_options['fields']['created']['id'] = 'created';
-$handler->display->display_options['fields']['created']['table'] = 'tmgmt_local_task';
-$handler->display->display_options['fields']['created']['field'] = 'created';
-$handler->display->display_options['fields']['created']['label'] = 'Date';
-$handler->display->display_options['fields']['created']['date_format'] = 'short';
 /* Field: Translation Task: Title */
 $handler->display->display_options['fields']['title']['id'] = 'title';
 $handler->display->display_options['fields']['title']['table'] = 'tmgmt_local_task';
@@ -748,16 +620,10 @@ $handler->display->display_options['fields']['item_count']['id'] = 'item_count';
 $handler->display->display_options['fields']['item_count']['table'] = 'tmgmt_local_task';
 $handler->display->display_options['fields']['item_count']['field'] = 'item_count';
 $handler->display->display_options['fields']['item_count']['label'] = 'Item count';
-/* Field: Translation Task: Assign to me */
-$handler->display->display_options['fields']['assign_to_me']['id'] = 'assign_to_me';
-$handler->display->display_options['fields']['assign_to_me']['table'] = 'tmgmt_local_task';
-$handler->display->display_options['fields']['assign_to_me']['field'] = 'assign_to_me';
-$handler->display->display_options['fields']['assign_to_me']['label'] = 'Action';
-$handler->display->display_options['fields']['assign_to_me']['alter']['word_boundary'] = FALSE;
-$handler->display->display_options['fields']['assign_to_me']['alter']['ellipsis'] = FALSE;
-$handler->display->display_options['fields']['assign_to_me']['element_label_colon'] = FALSE;
-$handler->display->display_options['fields']['assign_to_me']['element_default_classes'] = FALSE;
-$handler->display->display_options['fields']['assign_to_me']['hide_alter_empty'] = FALSE;
+/* Field: Translation Task: Operations */
+$handler->display->display_options['fields']['operations']['id'] = 'operations';
+$handler->display->display_options['fields']['operations']['table'] = 'tmgmt_local_task';
+$handler->display->display_options['fields']['operations']['field'] = 'operations';
 $handler->display->display_options['defaults']['filter_groups'] = FALSE;
 $handler->display->display_options['defaults']['filters'] = FALSE;
 /* Filter criterion: Translation Task: Status */
@@ -773,10 +639,10 @@ $handler->display->display_options['filters']['eligible']['table'] = 'tmgmt_job'
 $handler->display->display_options['filters']['eligible']['field'] = 'eligible';
 $handler->display->display_options['filters']['eligible']['relationship'] = 'job';
 $handler->display->display_options['path'] = 'translate/elegible';
-$handler->display->display_options['menu']['type'] = 'normal';
+$handler->display->display_options['menu']['type'] = 'tab';
 $handler->display->display_options['menu']['title'] = 'Eligible';
 $handler->display->display_options['menu']['description'] = 'List of eligible tasks';
-$handler->display->display_options['menu']['weight'] = '0';
+$handler->display->display_options['menu']['weight'] = '10';
 $handler->display->display_options['menu']['context'] = 0;
 
 /* Display: My */
@@ -882,54 +748,52 @@ $handler->display->display_options['fields']['views_bulk_operations']['element_l
 $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']['display_result'] = 1;
 $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(
   'rules_component::rules_tmgmt_local_task_assign1' => array(
     'selected' => 0,
-    'use_queue' => 0,
     'skip_confirmation' => 0,
     'override_label' => 0,
     'label' => '',
+    'postpone_processing' => 0,
   ),
   'rules_component::rules_tmgmt_local_task_assign' => array(
     'selected' => 0,
-    'use_queue' => 0,
     'skip_confirmation' => 0,
     'override_label' => 0,
     'label' => '',
+    'postpone_processing' => 0,
   ),
   'rules_component::rules_tmgmt_local_task_assign_to_me' => array(
     'selected' => 0,
-    'use_queue' => 0,
     'skip_confirmation' => 1,
     'override_label' => 1,
     'label' => 'Assign to me',
+    '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::views_bulk_operations_modify_action' => array(
     'selected' => 0,
-    'use_queue' => 0,
     'skip_confirmation' => 0,
     'override_label' => 0,
     'label' => '',
@@ -939,6 +803,7 @@ $handler->display->display_options['fields']['views_bulk_operations']['vbo_opera
         '_all_' => '_all_',
       ),
     ),
+    'postpone_processing' => 0,
   ),
   'action::views_bulk_operations_argument_selector_action' => array(
     'selected' => 0,
@@ -951,31 +816,31 @@ $handler->display->display_options['fields']['views_bulk_operations']['vbo_opera
   ),
   'action::system_goto_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,
   ),
   'rules_component::rules_test' => array(
     'selected' => 0,
-    'use_queue' => 0,
     'skip_confirmation' => 0,
     'override_label' => 0,
     'label' => '',
+    'postpone_processing' => 0,
   ),
   'rules_component::rules_tmgmt_local_task_unassign' => array(
     'selected' => 1,
-    'use_queue' => 0,
     'skip_confirmation' => 1,
     'override_label' => 1,
     'label' => 'Unassign',
+    'postpone_processing' => 0,
   ),
 );
 /* Field: Translation Task: Status */
@@ -986,12 +851,6 @@ $handler->display->display_options['fields']['status']['field'] = 'status';
 $handler->display->display_options['fields']['progress']['id'] = 'progress';
 $handler->display->display_options['fields']['progress']['table'] = 'tmgmt_local_task';
 $handler->display->display_options['fields']['progress']['field'] = 'progress';
-/* Field: Translation Task: Created */
-$handler->display->display_options['fields']['created']['id'] = 'created';
-$handler->display->display_options['fields']['created']['table'] = 'tmgmt_local_task';
-$handler->display->display_options['fields']['created']['field'] = 'created';
-$handler->display->display_options['fields']['created']['label'] = 'Date';
-$handler->display->display_options['fields']['created']['date_format'] = 'short';
 /* Field: Translation Task: Title */
 $handler->display->display_options['fields']['title']['id'] = 'title';
 $handler->display->display_options['fields']['title']['table'] = 'tmgmt_local_task';
@@ -1020,12 +879,10 @@ $handler->display->display_options['fields']['item_count']['id'] = 'item_count';
 $handler->display->display_options['fields']['item_count']['table'] = 'tmgmt_local_task';
 $handler->display->display_options['fields']['item_count']['field'] = 'item_count';
 $handler->display->display_options['fields']['item_count']['label'] = 'Item count';
-/* Field: Translation Task: Translate task items */
-$handler->display->display_options['fields']['translate']['id'] = 'translate';
-$handler->display->display_options['fields']['translate']['table'] = 'tmgmt_local_task';
-$handler->display->display_options['fields']['translate']['field'] = 'translate';
-$handler->display->display_options['fields']['translate']['label'] = 'Action';
-$handler->display->display_options['fields']['translate']['element_label_colon'] = FALSE;
+/* Field: Translation Task: Operations */
+$handler->display->display_options['fields']['operations']['id'] = 'operations';
+$handler->display->display_options['fields']['operations']['table'] = 'tmgmt_local_task';
+$handler->display->display_options['fields']['operations']['field'] = 'operations';
 $handler->display->display_options['defaults']['filter_groups'] = FALSE;
 $handler->display->display_options['defaults']['filters'] = FALSE;
 /* Filter criterion: User: Current */
@@ -1039,6 +896,11 @@ $handler->display->display_options['filters']['uid_current']['group'] = 1;
 $handler->display->display_options['filters']['status']['id'] = 'status';
 $handler->display->display_options['filters']['status']['table'] = 'tmgmt_local_task';
 $handler->display->display_options['filters']['status']['field'] = 'status';
+$handler->display->display_options['filters']['status']['value'] = array(
+  1 => '1',
+  2 => '2',
+  3 => '3',
+);
 $handler->display->display_options['filters']['status']['group'] = 1;
 $handler->display->display_options['filters']['status']['exposed'] = TRUE;
 $handler->display->display_options['filters']['status']['expose']['operator_id'] = 'status_op';
@@ -1049,9 +911,11 @@ $handler->display->display_options['filters']['status']['expose']['remember_role
   2 => '2',
   1 => 0,
   3 => 0,
-  8 => 0,
-  10 => 0,
+  4 => 0,
+  5 => 0,
+  6 => 0,
 );
+$handler->display->display_options['filters']['status']['expose']['reduce'] = TRUE;
 /* Filter criterion: Translation Management Job: Source_language */
 $handler->display->display_options['filters']['source_language']['id'] = 'source_language';
 $handler->display->display_options['filters']['source_language']['table'] = 'tmgmt_job';
@@ -1220,54 +1084,52 @@ $handler->display->display_options['fields']['views_bulk_operations']['element_l
 $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']['display_result'] = 1;
 $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(
   'rules_component::rules_tmgmt_local_task_assign1' => array(
     'selected' => 0,
-    'use_queue' => 0,
     'skip_confirmation' => 0,
     'override_label' => 0,
     'label' => '',
+    'postpone_processing' => 0,
   ),
   'rules_component::rules_tmgmt_local_task_assign' => array(
     'selected' => 0,
-    'use_queue' => 0,
     'skip_confirmation' => 0,
     'override_label' => 0,
     'label' => '',
+    'postpone_processing' => 0,
   ),
   'rules_component::rules_tmgmt_local_task_assign_to_me' => array(
     'selected' => 0,
-    'use_queue' => 0,
     'skip_confirmation' => 1,
     'override_label' => 1,
     'label' => 'Assign to me',
+    '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::views_bulk_operations_modify_action' => array(
     'selected' => 0,
-    'use_queue' => 0,
     'skip_confirmation' => 0,
     'override_label' => 0,
     'label' => '',
@@ -1277,6 +1139,7 @@ $handler->display->display_options['fields']['views_bulk_operations']['vbo_opera
         '_all_' => '_all_',
       ),
     ),
+    'postpone_processing' => 0,
   ),
   'action::views_bulk_operations_argument_selector_action' => array(
     'selected' => 0,
@@ -1289,31 +1152,31 @@ $handler->display->display_options['fields']['views_bulk_operations']['vbo_opera
   ),
   'action::system_goto_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,
   ),
   'rules_component::rules_test' => array(
     'selected' => 0,
-    'use_queue' => 0,
     'skip_confirmation' => 0,
     'override_label' => 0,
     'label' => '',
+    'postpone_processing' => 0,
   ),
   'rules_component::rules_tmgmt_local_task_unassign' => array(
     'selected' => 1,
-    'use_queue' => 0,
     'skip_confirmation' => 1,
     'override_label' => 1,
     'label' => 'Unassign',
+    'postpone_processing' => 0,
   ),
 );
 /* Field: Translation Task: Status */
@@ -1324,12 +1187,6 @@ $handler->display->display_options['fields']['status']['field'] = 'status';
 $handler->display->display_options['fields']['progress']['id'] = 'progress';
 $handler->display->display_options['fields']['progress']['table'] = 'tmgmt_local_task';
 $handler->display->display_options['fields']['progress']['field'] = 'progress';
-/* Field: Translation Task: Created */
-$handler->display->display_options['fields']['created']['id'] = 'created';
-$handler->display->display_options['fields']['created']['table'] = 'tmgmt_local_task';
-$handler->display->display_options['fields']['created']['field'] = 'created';
-$handler->display->display_options['fields']['created']['label'] = 'Date';
-$handler->display->display_options['fields']['created']['date_format'] = 'long';
 /* Field: Translation Task: Title */
 $handler->display->display_options['fields']['title']['id'] = 'title';
 $handler->display->display_options['fields']['title']['table'] = 'tmgmt_local_task';
@@ -1358,12 +1215,10 @@ $handler->display->display_options['fields']['item_count']['id'] = 'item_count';
 $handler->display->display_options['fields']['item_count']['table'] = 'tmgmt_local_task';
 $handler->display->display_options['fields']['item_count']['field'] = 'item_count';
 $handler->display->display_options['fields']['item_count']['label'] = 'Item count';
-/* Field: Translation Task: Translate task items */
-$handler->display->display_options['fields']['translate']['id'] = 'translate';
-$handler->display->display_options['fields']['translate']['table'] = 'tmgmt_local_task';
-$handler->display->display_options['fields']['translate']['field'] = 'translate';
-$handler->display->display_options['fields']['translate']['label'] = 'Action';
-$handler->display->display_options['fields']['translate']['element_label_colon'] = FALSE;
+/* Field: Translation Task: Operations */
+$handler->display->display_options['fields']['operations']['id'] = 'operations';
+$handler->display->display_options['fields']['operations']['table'] = 'tmgmt_local_task';
+$handler->display->display_options['fields']['operations']['field'] = 'operations';
 $handler->display->display_options['defaults']['filter_groups'] = FALSE;
 $handler->display->display_options['defaults']['filters'] = FALSE;
 /* Filter criterion: User: Current */
@@ -1447,10 +1302,10 @@ $handler->display->display_options['filters']['title']['expose']['remember_roles
   10 => 0,
 );
 $handler->display->display_options['path'] = 'translate/pending';
-$handler->display->display_options['menu']['type'] = 'normal';
+$handler->display->display_options['menu']['type'] = 'tab';
 $handler->display->display_options['menu']['title'] = 'Pending';
 $handler->display->display_options['menu']['description'] = 'List of pending tasks';
-$handler->display->display_options['menu']['weight'] = '2';
+$handler->display->display_options['menu']['weight'] = '20';
 $handler->display->display_options['menu']['context'] = 0;
 
 /* Display: Completed */
@@ -1565,54 +1420,52 @@ $handler->display->display_options['fields']['views_bulk_operations']['element_l
 $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']['display_result'] = 1;
 $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(
   'rules_component::rules_tmgmt_local_task_assign1' => array(
     'selected' => 0,
-    'use_queue' => 0,
     'skip_confirmation' => 0,
     'override_label' => 0,
     'label' => '',
+    'postpone_processing' => 0,
   ),
   'rules_component::rules_tmgmt_local_task_assign' => array(
     'selected' => 0,
-    'use_queue' => 0,
     'skip_confirmation' => 0,
     'override_label' => 0,
     'label' => '',
+    'postpone_processing' => 0,
   ),
   'rules_component::rules_tmgmt_local_task_assign_to_me' => array(
     'selected' => 0,
-    'use_queue' => 0,
     'skip_confirmation' => 1,
     'override_label' => 1,
     'label' => 'Assign to me',
+    '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::views_bulk_operations_modify_action' => array(
     'selected' => 0,
-    'use_queue' => 0,
     'skip_confirmation' => 0,
     'override_label' => 0,
     'label' => '',
@@ -1622,6 +1475,7 @@ $handler->display->display_options['fields']['views_bulk_operations']['vbo_opera
         '_all_' => '_all_',
       ),
     ),
+    'postpone_processing' => 0,
   ),
   'action::views_bulk_operations_argument_selector_action' => array(
     'selected' => 0,
@@ -1634,47 +1488,37 @@ $handler->display->display_options['fields']['views_bulk_operations']['vbo_opera
   ),
   'action::system_goto_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,
   ),
   'rules_component::rules_test' => array(
     'selected' => 0,
-    'use_queue' => 0,
     'skip_confirmation' => 0,
     'override_label' => 0,
     'label' => '',
+    'postpone_processing' => 0,
   ),
   'rules_component::rules_tmgmt_local_task_unassign' => array(
     'selected' => 1,
-    'use_queue' => 0,
     'skip_confirmation' => 1,
     'override_label' => 1,
     'label' => 'Unassign',
+    'postpone_processing' => 0,
   ),
 );
-/* Field: Translation Task: Status */
-$handler->display->display_options['fields']['status']['id'] = 'status';
-$handler->display->display_options['fields']['status']['table'] = 'tmgmt_local_task';
-$handler->display->display_options['fields']['status']['field'] = 'status';
 /* Field: Translation Task: Progress */
 $handler->display->display_options['fields']['progress']['id'] = 'progress';
 $handler->display->display_options['fields']['progress']['table'] = 'tmgmt_local_task';
 $handler->display->display_options['fields']['progress']['field'] = 'progress';
-/* Field: Translation Task: Created */
-$handler->display->display_options['fields']['created']['id'] = 'created';
-$handler->display->display_options['fields']['created']['table'] = 'tmgmt_local_task';
-$handler->display->display_options['fields']['created']['field'] = 'created';
-$handler->display->display_options['fields']['created']['label'] = 'Date';
-$handler->display->display_options['fields']['created']['date_format'] = 'long';
 /* Field: Translation Task: Title */
 $handler->display->display_options['fields']['title']['id'] = 'title';
 $handler->display->display_options['fields']['title']['table'] = 'tmgmt_local_task';
@@ -1698,17 +1542,10 @@ $handler->display->display_options['fields']['word_count']['id'] = 'word_count';
 $handler->display->display_options['fields']['word_count']['table'] = 'tmgmt_local_task';
 $handler->display->display_options['fields']['word_count']['field'] = 'word_count';
 $handler->display->display_options['fields']['word_count']['element_label_colon'] = FALSE;
-/* Field: Translation Task: Job item count */
-$handler->display->display_options['fields']['item_count']['id'] = 'item_count';
-$handler->display->display_options['fields']['item_count']['table'] = 'tmgmt_local_task';
-$handler->display->display_options['fields']['item_count']['field'] = 'item_count';
-$handler->display->display_options['fields']['item_count']['label'] = 'Item count';
-/* Field: Translation Task: Translate task items */
-$handler->display->display_options['fields']['translate']['id'] = 'translate';
-$handler->display->display_options['fields']['translate']['table'] = 'tmgmt_local_task';
-$handler->display->display_options['fields']['translate']['field'] = 'translate';
-$handler->display->display_options['fields']['translate']['label'] = 'Action';
-$handler->display->display_options['fields']['translate']['element_label_colon'] = FALSE;
+/* Field: Translation Task: Operations */
+$handler->display->display_options['fields']['operations']['id'] = 'operations';
+$handler->display->display_options['fields']['operations']['table'] = 'tmgmt_local_task';
+$handler->display->display_options['fields']['operations']['field'] = 'operations';
 $handler->display->display_options['defaults']['filter_groups'] = FALSE;
 $handler->display->display_options['defaults']['filters'] = FALSE;
 /* Filter criterion: User: Current */
@@ -1792,10 +1629,10 @@ $handler->display->display_options['filters']['title']['expose']['remember_roles
   10 => 0,
 );
 $handler->display->display_options['path'] = 'translate/completed';
-$handler->display->display_options['menu']['type'] = 'normal';
+$handler->display->display_options['menu']['type'] = 'tab';
 $handler->display->display_options['menu']['title'] = 'Completed';
 $handler->display->display_options['menu']['description'] = 'List of completed tasks';
-$handler->display->display_options['menu']['weight'] = '3';
+$handler->display->display_options['menu']['weight'] = '30';
 $handler->display->display_options['menu']['context'] = 0;
 
 /* Display: Rejected */
@@ -1910,54 +1747,52 @@ $handler->display->display_options['fields']['views_bulk_operations']['element_l
 $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']['display_result'] = 1;
 $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(
   'rules_component::rules_tmgmt_local_task_assign1' => array(
     'selected' => 0,
-    'use_queue' => 0,
     'skip_confirmation' => 0,
     'override_label' => 0,
     'label' => '',
+    'postpone_processing' => 0,
   ),
   'rules_component::rules_tmgmt_local_task_assign' => array(
     'selected' => 0,
-    'use_queue' => 0,
     'skip_confirmation' => 0,
     'override_label' => 0,
     'label' => '',
+    'postpone_processing' => 0,
   ),
   'rules_component::rules_tmgmt_local_task_assign_to_me' => array(
     'selected' => 0,
-    'use_queue' => 0,
     'skip_confirmation' => 1,
     'override_label' => 1,
     'label' => 'Assign to me',
+    '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::views_bulk_operations_modify_action' => array(
     'selected' => 0,
-    'use_queue' => 0,
     'skip_confirmation' => 0,
     'override_label' => 0,
     'label' => '',
@@ -1967,6 +1802,7 @@ $handler->display->display_options['fields']['views_bulk_operations']['vbo_opera
         '_all_' => '_all_',
       ),
     ),
+    'postpone_processing' => 0,
   ),
   'action::views_bulk_operations_argument_selector_action' => array(
     'selected' => 0,
@@ -1979,47 +1815,37 @@ $handler->display->display_options['fields']['views_bulk_operations']['vbo_opera
   ),
   'action::system_goto_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,
   ),
   'rules_component::rules_test' => array(
     'selected' => 0,
-    'use_queue' => 0,
     'skip_confirmation' => 0,
     'override_label' => 0,
     'label' => '',
+    'postpone_processing' => 0,
   ),
   'rules_component::rules_tmgmt_local_task_unassign' => array(
     'selected' => 1,
-    'use_queue' => 0,
     'skip_confirmation' => 1,
     'override_label' => 1,
     'label' => 'Unassign',
+    'postpone_processing' => 0,
   ),
 );
-/* Field: Translation Task: Status */
-$handler->display->display_options['fields']['status']['id'] = 'status';
-$handler->display->display_options['fields']['status']['table'] = 'tmgmt_local_task';
-$handler->display->display_options['fields']['status']['field'] = 'status';
 /* Field: Translation Task: Progress */
 $handler->display->display_options['fields']['progress']['id'] = 'progress';
 $handler->display->display_options['fields']['progress']['table'] = 'tmgmt_local_task';
 $handler->display->display_options['fields']['progress']['field'] = 'progress';
-/* Field: Translation Task: Created */
-$handler->display->display_options['fields']['created']['id'] = 'created';
-$handler->display->display_options['fields']['created']['table'] = 'tmgmt_local_task';
-$handler->display->display_options['fields']['created']['field'] = 'created';
-$handler->display->display_options['fields']['created']['label'] = 'Date';
-$handler->display->display_options['fields']['created']['date_format'] = 'long';
 /* Field: Translation Task: Title */
 $handler->display->display_options['fields']['title']['id'] = 'title';
 $handler->display->display_options['fields']['title']['table'] = 'tmgmt_local_task';
@@ -2048,12 +1874,10 @@ $handler->display->display_options['fields']['item_count']['id'] = 'item_count';
 $handler->display->display_options['fields']['item_count']['table'] = 'tmgmt_local_task';
 $handler->display->display_options['fields']['item_count']['field'] = 'item_count';
 $handler->display->display_options['fields']['item_count']['label'] = 'Item count';
-/* Field: Translation Task: Translate task items */
-$handler->display->display_options['fields']['translate']['id'] = 'translate';
-$handler->display->display_options['fields']['translate']['table'] = 'tmgmt_local_task';
-$handler->display->display_options['fields']['translate']['field'] = 'translate';
-$handler->display->display_options['fields']['translate']['label'] = 'Action';
-$handler->display->display_options['fields']['translate']['element_label_colon'] = FALSE;
+/* Field: Translation Task: Operations */
+$handler->display->display_options['fields']['operations']['id'] = 'operations';
+$handler->display->display_options['fields']['operations']['table'] = 'tmgmt_local_task';
+$handler->display->display_options['fields']['operations']['field'] = 'operations';
 $handler->display->display_options['defaults']['filter_groups'] = FALSE;
 $handler->display->display_options['defaults']['filters'] = FALSE;
 /* Filter criterion: User: Current */
@@ -2137,10 +1961,10 @@ $handler->display->display_options['filters']['title']['expose']['remember_roles
   10 => 0,
 );
 $handler->display->display_options['path'] = 'translate/rejected';
-$handler->display->display_options['menu']['type'] = 'normal';
+$handler->display->display_options['menu']['type'] = 'tab';
 $handler->display->display_options['menu']['title'] = 'Rejected';
 $handler->display->display_options['menu']['description'] = 'List of rejected tasks';
-$handler->display->display_options['menu']['weight'] = '1';
+$handler->display->display_options['menu']['weight'] = '40';
 $handler->display->display_options['menu']['context'] = 0;
 
 /* Display: Closed */
@@ -2255,54 +2079,52 @@ $handler->display->display_options['fields']['views_bulk_operations']['element_l
 $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']['display_result'] = 1;
 $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(
   'rules_component::rules_tmgmt_local_task_assign1' => array(
     'selected' => 0,
-    'use_queue' => 0,
     'skip_confirmation' => 0,
     'override_label' => 0,
     'label' => '',
+    'postpone_processing' => 0,
   ),
   'rules_component::rules_tmgmt_local_task_assign' => array(
     'selected' => 0,
-    'use_queue' => 0,
     'skip_confirmation' => 0,
     'override_label' => 0,
     'label' => '',
+    'postpone_processing' => 0,
   ),
   'rules_component::rules_tmgmt_local_task_assign_to_me' => array(
     'selected' => 0,
-    'use_queue' => 0,
     'skip_confirmation' => 1,
     'override_label' => 1,
     'label' => 'Assign to me',
+    '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::views_bulk_operations_modify_action' => array(
     'selected' => 0,
-    'use_queue' => 0,
     'skip_confirmation' => 0,
     'override_label' => 0,
     'label' => '',
@@ -2312,6 +2134,7 @@ $handler->display->display_options['fields']['views_bulk_operations']['vbo_opera
         '_all_' => '_all_',
       ),
     ),
+    'postpone_processing' => 0,
   ),
   'action::views_bulk_operations_argument_selector_action' => array(
     'selected' => 0,
@@ -2324,47 +2147,37 @@ $handler->display->display_options['fields']['views_bulk_operations']['vbo_opera
   ),
   'action::system_goto_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,
   ),
   'rules_component::rules_test' => array(
     'selected' => 0,
-    'use_queue' => 0,
     'skip_confirmation' => 0,
     'override_label' => 0,
     'label' => '',
+    'postpone_processing' => 0,
   ),
   'rules_component::rules_tmgmt_local_task_unassign' => array(
     'selected' => 1,
-    'use_queue' => 0,
     'skip_confirmation' => 1,
     'override_label' => 1,
     'label' => 'Unassign',
+    'postpone_processing' => 0,
   ),
 );
-/* Field: Translation Task: Status */
-$handler->display->display_options['fields']['status']['id'] = 'status';
-$handler->display->display_options['fields']['status']['table'] = 'tmgmt_local_task';
-$handler->display->display_options['fields']['status']['field'] = 'status';
 /* Field: Translation Task: Progress */
 $handler->display->display_options['fields']['progress']['id'] = 'progress';
 $handler->display->display_options['fields']['progress']['table'] = 'tmgmt_local_task';
 $handler->display->display_options['fields']['progress']['field'] = 'progress';
-/* Field: Translation Task: Created */
-$handler->display->display_options['fields']['created']['id'] = 'created';
-$handler->display->display_options['fields']['created']['table'] = 'tmgmt_local_task';
-$handler->display->display_options['fields']['created']['field'] = 'created';
-$handler->display->display_options['fields']['created']['label'] = 'Date';
-$handler->display->display_options['fields']['created']['date_format'] = 'long';
 /* Field: Translation Task: Title */
 $handler->display->display_options['fields']['title']['id'] = 'title';
 $handler->display->display_options['fields']['title']['table'] = 'tmgmt_local_task';
@@ -2393,12 +2206,10 @@ $handler->display->display_options['fields']['item_count']['id'] = 'item_count';
 $handler->display->display_options['fields']['item_count']['table'] = 'tmgmt_local_task';
 $handler->display->display_options['fields']['item_count']['field'] = 'item_count';
 $handler->display->display_options['fields']['item_count']['label'] = 'Item count';
-/* Field: Translation Task: Translate task items */
-$handler->display->display_options['fields']['translate']['id'] = 'translate';
-$handler->display->display_options['fields']['translate']['table'] = 'tmgmt_local_task';
-$handler->display->display_options['fields']['translate']['field'] = 'translate';
-$handler->display->display_options['fields']['translate']['label'] = 'Action';
-$handler->display->display_options['fields']['translate']['element_label_colon'] = FALSE;
+/* Field: Translation Task: Operations */
+$handler->display->display_options['fields']['operations']['id'] = 'operations';
+$handler->display->display_options['fields']['operations']['table'] = 'tmgmt_local_task';
+$handler->display->display_options['fields']['operations']['field'] = 'operations';
 $handler->display->display_options['defaults']['filter_groups'] = FALSE;
 $handler->display->display_options['defaults']['filters'] = FALSE;
 /* Filter criterion: User: Current */
@@ -2482,10 +2293,10 @@ $handler->display->display_options['filters']['title']['expose']['remember_roles
   10 => 0,
 );
 $handler->display->display_options['path'] = 'translate/closed';
-$handler->display->display_options['menu']['type'] = 'normal';
+$handler->display->display_options['menu']['type'] = 'tab';
 $handler->display->display_options['menu']['title'] = 'Closed';
 $handler->display->display_options['menu']['description'] = 'List of closed tasks';
-$handler->display->display_options['menu']['weight'] = '4';
+$handler->display->display_options['menu']['weight'] = '50';
 $handler->display->display_options['menu']['context'] = 0;
 $translatables['tmgmt_local_task_overview'] = array(
   t('Master'),
@@ -2504,29 +2315,29 @@ $translatables['tmgmt_local_task_overview'] = array(
   t('next ›'),
   t('last »'),
   t('Translation Management Job'),
+  t('Assigned Translator'),
   t('Title'),
   t('Word count'),
   t('Job item count'),
   t('Progress'),
-  t('Admin Overview'),
+  t('Status'),
   t('Unassigned and mine'),
-  t('Unassigned Eligible Tasks'),
+  t('Translate'),
   t('Shows elegible (unasigned) and mine tasks.'),
   t('<h2>My Tasks</h2>'),
   t('You do not have eligible tasks.'),
-  t('Date'),
   t('Language'),
   t('Target language'),
   t('Item count'),
-  t('Action'),
+  t('Operations'),
   t('Elegible'),
+  t('Unassigned Eligible Tasks'),
   t('Shows elegible (unasigned) tasks.'),
   t('Message'),
   t('My'),
   t('My Tasks'),
   t('Shows tasks for current user (translator).'),
   t('Translator'),
-  t('Status'),
   t('Language From'),
   t('Language To'),
   t('Pending'),
diff --git a/translators/tmgmt_local/views/tmgmt_local_translate.view.inc b/translators/tmgmt_local/views/tmgmt_local_translate.view.inc
deleted file mode 100644
index 59e33ec..0000000
--- a/translators/tmgmt_local/views/tmgmt_local_translate.view.inc
+++ /dev/null
@@ -1,291 +0,0 @@
-<?php
-
-$view = new view();
-$view->name = 'tmgmt_local_translate';
-$view->description = 'Shows a list of translatable objects.';
-$view->tag = 'default';
-$view->base_table = 'tmgmt_job_item';
-$view->human_name = 'Translate';
-$view->core = 7;
-$view->api_version = '3.0';
-$view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
-
-/* Display: Master */
-$handler = $view->new_display('default', 'Master', 'default');
-$handler->display->display_options['title'] = 'Translate Task';
-$handler->display->display_options['use_more_always'] = FALSE;
-$handler->display->display_options['access']['type'] = 'perm';
-$handler->display->display_options['access']['perm'] = 'provide translation services';
-$handler->display->display_options['cache']['type'] = 'none';
-$handler->display->display_options['query']['type'] = 'views_query';
-$handler->display->display_options['exposed_form']['type'] = 'basic';
-$handler->display->display_options['pager']['type'] = 'full';
-$handler->display->display_options['pager']['options']['items_per_page'] = '10';
-$handler->display->display_options['style_plugin'] = 'table';
-$handler->display->display_options['style_options']['columns'] = array(
-  'item_id' => 'item_id',
-  'label' => 'label',
-  'plugin' => 'plugin',
-  'progress' => 'progress',
-  'changed' => 'changed',
-  'created' => 'created',
-);
-$handler->display->display_options['style_options']['default'] = '-1';
-$handler->display->display_options['style_options']['info'] = array(
-  'label' => array(
-    'align' => '',
-    'separator' => '',
-    'empty_column' => 0,
-  ),
-  'plugin' => array(
-    'sortable' => 0,
-    'default_sort_order' => 'asc',
-    'align' => '',
-    'separator' => '',
-    'empty_column' => 0,
-  ),
-  'progress' => array(
-    'align' => '',
-    'separator' => '',
-    'empty_column' => 0,
-  ),
-);
-/* No results behavior: Global: Text area */
-$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']['content'] = 'There are no translatable objects for you.';
-$handler->display->display_options['empty']['area']['format'] = 'filtered_html';
-/* Relationship: Translation Management Job Item: Tjid */
-$handler->display->display_options['relationships']['tjid']['id'] = 'tjid';
-$handler->display->display_options['relationships']['tjid']['table'] = 'tmgmt_job_item';
-$handler->display->display_options['relationships']['tjid']['field'] = 'tjid';
-$handler->display->display_options['relationships']['tjid']['required'] = TRUE;
-/* Relationship: Translation Management Job: Translator */
-$handler->display->display_options['relationships']['translator']['id'] = 'translator';
-$handler->display->display_options['relationships']['translator']['table'] = 'tmgmt_job';
-$handler->display->display_options['relationships']['translator']['field'] = 'translator';
-$handler->display->display_options['relationships']['translator']['relationship'] = 'tjid';
-$handler->display->display_options['relationships']['translator']['required'] = TRUE;
-/* Field: Translation Management Job Item: Tjid */
-$handler->display->display_options['fields']['tjid']['id'] = 'tjid';
-$handler->display->display_options['fields']['tjid']['table'] = 'tmgmt_job_item';
-$handler->display->display_options['fields']['tjid']['field'] = 'tjid';
-$handler->display->display_options['fields']['tjid']['exclude'] = TRUE;
-/* Field: Translation Management Job Item: Label */
-$handler->display->display_options['fields']['label']['id'] = 'label';
-$handler->display->display_options['fields']['label']['table'] = 'tmgmt_job_item';
-$handler->display->display_options['fields']['label']['field'] = 'label';
-$handler->display->display_options['fields']['label']['alter']['alter_text'] = TRUE;
-$handler->display->display_options['fields']['label']['alter']['make_link'] = TRUE;
-$handler->display->display_options['fields']['label']['alter']['path'] = 'translate/[tjid]';
-/* Field: Translation Management Job Item: Plugin */
-$handler->display->display_options['fields']['plugin']['id'] = 'plugin';
-$handler->display->display_options['fields']['plugin']['table'] = 'tmgmt_job_item';
-$handler->display->display_options['fields']['plugin']['field'] = 'plugin';
-/* Field: Translation Management Job Item: Progress */
-$handler->display->display_options['fields']['progress']['id'] = 'progress';
-$handler->display->display_options['fields']['progress']['table'] = 'tmgmt_job_item';
-$handler->display->display_options['fields']['progress']['field'] = 'progress';
-/* Sort criterion: Translation Management Job: Created */
-$handler->display->display_options['sorts']['created']['id'] = 'created';
-$handler->display->display_options['sorts']['created']['table'] = 'tmgmt_job';
-$handler->display->display_options['sorts']['created']['field'] = 'created';
-$handler->display->display_options['sorts']['created']['relationship'] = 'tjid';
-/* Filter criterion: Translation Management Translator: Plugin */
-$handler->display->display_options['filters']['plugin']['id'] = 'plugin';
-$handler->display->display_options['filters']['plugin']['table'] = 'tmgmt_translator';
-$handler->display->display_options['filters']['plugin']['field'] = 'plugin';
-$handler->display->display_options['filters']['plugin']['relationship'] = 'translator';
-$handler->display->display_options['filters']['plugin']['value'] = array(
-  'local' => 'local',
-);
-
-/* Display: Translate Task */
-$handler = $view->new_display('page', 'Translate Task', 'translate_task');
-$handler->display->display_options['defaults']['title'] = FALSE;
-$handler->display->display_options['title'] = 'Translate Task Items';
-$handler->display->display_options['display_description'] = 'Show list of translatable task items.';
-$handler->display->display_options['defaults']['hide_admin_links'] = FALSE;
-$handler->display->display_options['defaults']['relationships'] = FALSE;
-/* Relationship: Translation Management Job Item: Tjid */
-$handler->display->display_options['relationships']['tjid']['id'] = 'tjid';
-$handler->display->display_options['relationships']['tjid']['table'] = 'tmgmt_job_item';
-$handler->display->display_options['relationships']['tjid']['field'] = 'tjid';
-$handler->display->display_options['relationships']['tjid']['required'] = TRUE;
-/* Relationship: Translation Management Job: Translator */
-$handler->display->display_options['relationships']['translator']['id'] = 'translator';
-$handler->display->display_options['relationships']['translator']['table'] = 'tmgmt_job';
-$handler->display->display_options['relationships']['translator']['field'] = 'translator';
-$handler->display->display_options['relationships']['translator']['relationship'] = 'tjid';
-$handler->display->display_options['relationships']['translator']['required'] = TRUE;
-/* Relationship: Translation Management Job: Translation Management Local Task */
-$handler->display->display_options['relationships']['tmgmt_local_task']['id'] = 'tmgmt_local_task';
-$handler->display->display_options['relationships']['tmgmt_local_task']['table'] = 'tmgmt_job';
-$handler->display->display_options['relationships']['tmgmt_local_task']['field'] = 'tmgmt_local_task';
-$handler->display->display_options['relationships']['tmgmt_local_task']['relationship'] = 'tjid';
-$handler->display->display_options['relationships']['tmgmt_local_task']['label'] = 'Translation Task';
-$handler->display->display_options['relationships']['tmgmt_local_task']['required'] = TRUE;
-$handler->display->display_options['defaults']['fields'] = FALSE;
-/* Field: Translation Management Local Task: Translation management local task ID */
-$handler->display->display_options['fields']['tltid']['id'] = 'tltid';
-$handler->display->display_options['fields']['tltid']['table'] = 'tmgmt_local_task';
-$handler->display->display_options['fields']['tltid']['field'] = 'tltid';
-$handler->display->display_options['fields']['tltid']['relationship'] = 'tmgmt_local_task';
-$handler->display->display_options['fields']['tltid']['label'] = '';
-$handler->display->display_options['fields']['tltid']['exclude'] = TRUE;
-$handler->display->display_options['fields']['tltid']['element_label_colon'] = FALSE;
-/* Field: Translation Management Job Item: Tjid */
-$handler->display->display_options['fields']['tjid']['id'] = 'tjid';
-$handler->display->display_options['fields']['tjid']['table'] = 'tmgmt_job_item';
-$handler->display->display_options['fields']['tjid']['field'] = 'tjid';
-$handler->display->display_options['fields']['tjid']['exclude'] = TRUE;
-/* Field: Translation Management Job Item: Label */
-$handler->display->display_options['fields']['label']['id'] = 'label';
-$handler->display->display_options['fields']['label']['table'] = 'tmgmt_job_item';
-$handler->display->display_options['fields']['label']['field'] = 'label';
-$handler->display->display_options['fields']['label']['alter']['path'] = 'translate/[tltid]/item/[tjid]';
-/* Field: Translation Management Job Item: State */
-$handler->display->display_options['fields']['state']['id'] = 'state';
-$handler->display->display_options['fields']['state']['table'] = 'tmgmt_job_item';
-$handler->display->display_options['fields']['state']['field'] = 'state';
-/* Field: Translation Management Job Item: Progress */
-$handler->display->display_options['fields']['progress']['id'] = 'progress';
-$handler->display->display_options['fields']['progress']['table'] = 'tmgmt_job_item';
-$handler->display->display_options['fields']['progress']['field'] = 'progress';
-/* Field: Translation Management Job Item: Word count */
-$handler->display->display_options['fields']['word_count']['id'] = 'word_count';
-$handler->display->display_options['fields']['word_count']['table'] = 'tmgmt_job_item';
-$handler->display->display_options['fields']['word_count']['field'] = 'word_count';
-/* Field: Translation Management Local Task: Translate Task Item */
-$handler->display->display_options['fields']['translate_task_item']['id'] = 'translate_task_item';
-$handler->display->display_options['fields']['translate_task_item']['table'] = 'tmgmt_local_task';
-$handler->display->display_options['fields']['translate_task_item']['field'] = 'translate_task_item';
-$handler->display->display_options['fields']['translate_task_item']['relationship'] = 'tmgmt_local_task';
-$handler->display->display_options['fields']['translate_task_item']['label'] = 'Action';
-$handler->display->display_options['defaults']['arguments'] = FALSE;
-/* Contextual filter: Translation Management Local Task: Translation management local task ID */
-$handler->display->display_options['arguments']['tltid']['id'] = 'tltid';
-$handler->display->display_options['arguments']['tltid']['table'] = 'tmgmt_local_task';
-$handler->display->display_options['arguments']['tltid']['field'] = 'tltid';
-$handler->display->display_options['arguments']['tltid']['relationship'] = 'tmgmt_local_task';
-$handler->display->display_options['arguments']['tltid']['default_action'] = 'default';
-$handler->display->display_options['arguments']['tltid']['default_argument_type'] = 'raw';
-$handler->display->display_options['arguments']['tltid']['default_argument_options']['index'] = '1';
-$handler->display->display_options['arguments']['tltid']['summary']['number_of_records'] = '0';
-$handler->display->display_options['arguments']['tltid']['summary']['format'] = 'default_summary';
-$handler->display->display_options['arguments']['tltid']['summary_options']['items_per_page'] = '25';
-$handler->display->display_options['path'] = 'translate/%';
-$handler->display->display_options['menu']['type'] = 'normal';
-$handler->display->display_options['menu']['title'] = 'Translate';
-
-/* Display: View Task */
-$handler = $view->new_display('page', 'View Task', 'manager_view');
-$handler->display->display_options['defaults']['title'] = FALSE;
-$handler->display->display_options['title'] = 'Translate Task Items';
-$handler->display->display_options['display_description'] = 'Show list of translatable task items - suitable for managers.';
-$handler->display->display_options['defaults']['hide_admin_links'] = FALSE;
-$handler->display->display_options['defaults']['access'] = FALSE;
-$handler->display->display_options['access']['type'] = 'perm';
-$handler->display->display_options['access']['perm'] = 'administer translation tasks';
-$handler->display->display_options['defaults']['relationships'] = FALSE;
-/* Relationship: Translation Management Job Item: Tjid */
-$handler->display->display_options['relationships']['tjid']['id'] = 'tjid';
-$handler->display->display_options['relationships']['tjid']['table'] = 'tmgmt_job_item';
-$handler->display->display_options['relationships']['tjid']['field'] = 'tjid';
-$handler->display->display_options['relationships']['tjid']['required'] = TRUE;
-/* Relationship: Translation Management Job: Translator */
-$handler->display->display_options['relationships']['translator']['id'] = 'translator';
-$handler->display->display_options['relationships']['translator']['table'] = 'tmgmt_job';
-$handler->display->display_options['relationships']['translator']['field'] = 'translator';
-$handler->display->display_options['relationships']['translator']['relationship'] = 'tjid';
-$handler->display->display_options['relationships']['translator']['required'] = TRUE;
-/* Relationship: Translation Management Job: Translation Management Local Task */
-$handler->display->display_options['relationships']['tmgmt_local_task']['id'] = 'tmgmt_local_task';
-$handler->display->display_options['relationships']['tmgmt_local_task']['table'] = 'tmgmt_job';
-$handler->display->display_options['relationships']['tmgmt_local_task']['field'] = 'tmgmt_local_task';
-$handler->display->display_options['relationships']['tmgmt_local_task']['relationship'] = 'tjid';
-$handler->display->display_options['relationships']['tmgmt_local_task']['label'] = 'Translation Task';
-$handler->display->display_options['relationships']['tmgmt_local_task']['required'] = TRUE;
-$handler->display->display_options['defaults']['fields'] = FALSE;
-/* Field: Translation Management Local Task: Translation management local task ID */
-$handler->display->display_options['fields']['tltid']['id'] = 'tltid';
-$handler->display->display_options['fields']['tltid']['table'] = 'tmgmt_local_task';
-$handler->display->display_options['fields']['tltid']['field'] = 'tltid';
-$handler->display->display_options['fields']['tltid']['relationship'] = 'tmgmt_local_task';
-$handler->display->display_options['fields']['tltid']['label'] = '';
-$handler->display->display_options['fields']['tltid']['exclude'] = TRUE;
-$handler->display->display_options['fields']['tltid']['element_label_colon'] = FALSE;
-/* Field: Translation Management Job Item: Tjid */
-$handler->display->display_options['fields']['tjid']['id'] = 'tjid';
-$handler->display->display_options['fields']['tjid']['table'] = 'tmgmt_job_item';
-$handler->display->display_options['fields']['tjid']['field'] = 'tjid';
-$handler->display->display_options['fields']['tjid']['exclude'] = TRUE;
-/* Field: Translation Management Job Item: Label */
-$handler->display->display_options['fields']['label']['id'] = 'label';
-$handler->display->display_options['fields']['label']['table'] = 'tmgmt_job_item';
-$handler->display->display_options['fields']['label']['field'] = 'label';
-$handler->display->display_options['fields']['label']['alter']['path'] = 'translate/[tltid]/item/[tjid]';
-/* Field: Translation Management Job Item: State */
-$handler->display->display_options['fields']['state']['id'] = 'state';
-$handler->display->display_options['fields']['state']['table'] = 'tmgmt_job_item';
-$handler->display->display_options['fields']['state']['field'] = 'state';
-/* Field: Translation Management Job Item: Progress */
-$handler->display->display_options['fields']['progress']['id'] = 'progress';
-$handler->display->display_options['fields']['progress']['table'] = 'tmgmt_job_item';
-$handler->display->display_options['fields']['progress']['field'] = 'progress';
-/* Field: Translation Management Job Item: Word count */
-$handler->display->display_options['fields']['word_count']['id'] = 'word_count';
-$handler->display->display_options['fields']['word_count']['table'] = 'tmgmt_job_item';
-$handler->display->display_options['fields']['word_count']['field'] = 'word_count';
-$handler->display->display_options['defaults']['arguments'] = FALSE;
-/* Contextual filter: Translation Management Local Task: Translation management local task ID */
-$handler->display->display_options['arguments']['tltid']['id'] = 'tltid';
-$handler->display->display_options['arguments']['tltid']['table'] = 'tmgmt_local_task';
-$handler->display->display_options['arguments']['tltid']['field'] = 'tltid';
-$handler->display->display_options['arguments']['tltid']['relationship'] = 'tmgmt_local_task';
-$handler->display->display_options['arguments']['tltid']['default_action'] = 'default';
-$handler->display->display_options['arguments']['tltid']['default_argument_type'] = 'raw';
-$handler->display->display_options['arguments']['tltid']['default_argument_options']['index'] = '1';
-$handler->display->display_options['arguments']['tltid']['summary']['number_of_records'] = '0';
-$handler->display->display_options['arguments']['tltid']['summary']['format'] = 'default_summary';
-$handler->display->display_options['arguments']['tltid']['summary_options']['items_per_page'] = '25';
-$handler->display->display_options['path'] = 'manage-translate/task/%';
-$handler->display->display_options['menu']['title'] = 'Translate';
-$handler->display->display_options['menu']['weight'] = '0';
-$handler->display->display_options['menu']['context'] = 0;
-$translatables['tmgmt_local_translate'] = array(
-  t('Master'),
-  t('Translate Task'),
-  t('more'),
-  t('Apply'),
-  t('Reset'),
-  t('Sort by'),
-  t('Asc'),
-  t('Desc'),
-  t('Items per page'),
-  t('- All -'),
-  t('Offset'),
-  t('« first'),
-  t('‹ previous'),
-  t('next ›'),
-  t('last »'),
-  t('There are no translatable objects for you.'),
-  t('Translation Management Job'),
-  t('Translation Management Translator'),
-  t('Tjid'),
-  t('.'),
-  t(','),
-  t('Label'),
-  t('Plugin'),
-  t('Progress'),
-  t('Translate Task Items'),
-  t('Show list of translatable task items.'),
-  t('Translation Task'),
-  t('State'),
-  t('Word count'),
-  t('Action'),
-  t('All'),
-  t('View Task'),
-  t('Show list of translatable task items - suitable for managers.'),
-);