diff --git a/src/Form/JobForm.php b/src/Form/JobForm.php
index 56f81b3..4c37f17 100644
--- a/src/Form/JobForm.php
+++ b/src/Form/JobForm.php
@@ -466,13 +466,13 @@ class JobForm extends TmgmtFormBase {
         '#weight' => 10,
       );
       $actions['abort_job'] = array(
-        '#type' => 'submit',
-        '#value' => t('Abort job'),
-        '#redirect' => 'admin/tmgmt/jobs/' . $job->id() . '/abort',
-        '#submit' => array('tmgmt_submit_redirect'),
-        '#access' => $job->isAbortable(),
-        '#weight' => 15,
-      );
+         '#type' => 'submit',
+          '#value' => t('Abort job'),
+          '#redirect' => 'admin/tmgmt/jobs/' . $job->id() . '/abort',
+          '#submit' => array('tmgmt_submit_redirect'),
+          '#access' => $job->isAbortable(),
+          '#weight' => 15,
+        );
     }
     else {
       $actions['save']['#button_type'] = 'primary';
diff --git a/src/Form/JobItemForm.php b/src/Form/JobItemForm.php
index 1117b85..21ef498 100644
--- a/src/Form/JobItemForm.php
+++ b/src/Form/JobItemForm.php
@@ -32,6 +32,7 @@ class JobItemForm extends TmgmtFormBase {
    * @var \Drupal\tmgmt\JobItemInterface
    */
   protected $entity;
+  
 
   /**
    * Overrides Drupal\Core\Entity\EntityForm::form().
@@ -163,8 +164,20 @@ class JobItemForm extends TmgmtFormBase {
 
   protected function actions(array $form, FormStateInterface $form_state) {
     $item = $this->entity;
-
-    // Add the form actions as well.
+    $job = $item->getJob();
+    
+//    // Add the form actions as well.
+    if($item->isActive() || $item->isNeedsReview()){
+    $actions['abort_job'] = array(
+      '#type' => 'submit',
+      '#value' => t('Abort item'),
+      '#redirect' => 'admin/tmgmt/items/' .$item->id() .'/abort',
+      '#submit' => array('tmgmt_submit_redirect'),
+      '#access' => $job->isAbortable(),
+      '#weight' => 10,
+        );  
+    }
+    
     $actions['accept'] = array(
       '#type' => 'submit',
       '#button_type' => 'primary',
@@ -196,6 +209,7 @@ class JobItemForm extends TmgmtFormBase {
       '#validate' => ['::validateTags'],
       '#submit' => ['::submitForm'],
     );
+    
     if ($item->getSourcePlugin() instanceof SourcePreviewInterface && $item->getSourcePlugin()->getPreviewUrl($item)) {
       $actions['preview'] = [
         '#type' => 'link',
@@ -206,6 +220,7 @@ class JobItemForm extends TmgmtFormBase {
         ],
       ];
     }
+    
     return $actions;
   }
 
@@ -260,7 +275,7 @@ class JobItemForm extends TmgmtFormBase {
       if (isset($value['data']['translation']['value'])) {
         $label = $value['data']['translation']['value']['#value'];
       }
-      else {
+      else {  
         $label = $value['data']['translation']['#value'];
       }