diff --git a/application/controllers/JobController.php b/application/controllers/JobController.php
index 05991345..933e84f4 100644
--- a/application/controllers/JobController.php
+++ b/application/controllers/JobController.php
@@ -2,90 +2,72 @@
 
 namespace Icinga\Module\Director\Controllers;
 
+use Icinga\Module\Director\Forms\DirectorJobForm;
 use Icinga\Module\Director\Web\Controller\ActionController;
 use Icinga\Module\Director\Objects\DirectorJob;
-use Icinga\Data\Filter\Filter;
-use Icinga\Web\Notification;
-use Icinga\Web\Url;
+use Icinga\Module\Director\Web\Widget\JobDetails;
 
 class JobController extends ActionController
 {
-    public function addAction()
-    {
-        $this->indexAction();
-    }
-
     public function indexAction()
     {
-        if (! ($id = $this->params->get('id'))) {
-            return $this->editAction();
-        }
-
-        $this->prepareTabs($id)->activate('show');
-        $this->view->job = DirectorJob::load($id, $this->db());
-        $this->view->title = sprintf(
-            $this->translate('Job: %s'),
-            $this->view->job->job_name
-        );
+        $job = $this->requireJob();
+        $this
+            ->addJobTabs($job, 'show')
+            ->addTitle($this->translate('Job: %s'), $job->get('job_name'))
+            ->content()->add(new JobDetails($job));
     }
 
-    public function runAction()
+    public function addAction()
     {
-        // TODO: Form, POST
-        $id = $this->params->get('id');
-        $job = DirectorJob::load($id, $this->db());
-        if ($job->run()) {
-            Notification::success('Job has successfully been completed');
-            $this->redirectNow(
-                Url::fromPath(
-                    'director/job',
-                    array('id' => $id)
-                )
+        $this
+            ->addSingleTab($this->translate('New Job'))
+            ->addTitle($this->translate('Add a new Job'))
+            ->content()->add(
+                DirectorJobForm::load()
+                    ->setSuccessUrl('director/job')
+                    ->setDb($this->db())
+                    ->handleRequest()
             );
-        } else {
-            Notification::success('Job run failed');
-        }
     }
 
     public function editAction()
     {
-        $form = $this->view->form = $this->loadForm('directorJob')
-            ->setSuccessUrl('director/job')
-            ->setDb($this->db());
+        $job = $this->requireJob();
+        $form = DirectorJobForm::load()
+            ->setListUrl('director/jobs')
+            ->setObject($job)
+            ->loadObject($this->params->getRequired('id'))
+            ->handleRequest();
 
-        if ($id = $this->params->get('id')) {
-            $this->prepareTabs($id)->activate('edit');
-            $form->loadObject($id);
-            $this->view->title = sprintf(
-                $this->translate('Job %s'),
-                $form->getObject()->job_name
-            );
-        } else {
-            $this->view->title = $this->translate('Add job');
-            $this->prepareTabs()->activate('add');
-        }
-
-        $form->handleRequest();
-        $this->setViewScript('object/form');
+        $this
+            ->addJobTabs($job, 'edit')
+            ->addTitle($this->translate('Job: %s'), $job->get('job_name'))
+            ->content()->add($form);
     }
 
-    protected function prepareTabs($id = null)
+    /**
+     * @return DirectorJob
+     */
+    protected function requireJob()
     {
-        if ($id) {
-            return $this->getTabs()->add('show', array(
-                'url'       => 'director/job',
-                'urlParams' => array('id' => $id),
-                'label'     => $this->translate('Job'),
-            ))->add('edit', array(
-                'url'       => 'director/job/edit',
-                'urlParams' => array('id' => $id),
-                'label'     => $this->translate('Config'),
-            ));
-        } else {
-            return $this->getTabs()->add('add', array(
-                'url'       => 'director/job/add',
-                'label'     => $this->translate('Add a job'),
-            ));
-        }
+        return DirectorJob::load($this->params->getRequired('id'), $this->db());
+    }
+
+    protected function addJobTabs(DirectorJob $job, $active)
+    {
+        $id = $job->getId();
+
+        $this->tabs()->add('show', [
+            'url'       => 'director/job',
+            'urlParams' => ['id' => $id],
+            'label'     => $this->translate('Job'),
+        ])->add('edit', [
+            'url'       => 'director/job/edit',
+            'urlParams' => ['id' => $id],
+            'label'     => $this->translate('Config'),
+        ])->activate($active);
+
+        return $this;
     }
 }
diff --git a/library/Director/Web/Widget/JobDetails.php b/library/Director/Web/Widget/JobDetails.php
new file mode 100644
index 00000000..037c95ac
--- /dev/null
+++ b/library/Director/Web/Widget/JobDetails.php
@@ -0,0 +1,54 @@
+<?php
+
+namespace Icinga\Module\Director\Web\Widget;
+
+use Icinga\Module\Director\Objects\DirectorJob;
+use ipl\Html\Html;
+use ipl\Translation\TranslationHelper;
+
+class JobDetails extends Html
+{
+    use TranslationHelper;
+
+    public function __construct(DirectorJob $job)
+    {
+        if ($job->disabled === 'y') {
+            $this->add(Html::p(['class' => 'error'], sprintf(
+                $this->translate(
+                    'This job would run every %ds. It has been disabled and will'
+                    . ' therefore not be executed as scheduled'
+                ),
+                $job->run_interval
+            )));
+        } else {
+            //$class = $job->job(); echo $class::getDescription()
+            $msg = $job->isPending()
+                ? sprintf(
+                    $this->translate('This job runs every %ds and is currently pending'),
+                    $job->run_interval
+                )
+                : sprintf(
+                    $this->translate('This job runs every %ds.'),
+                    $job->run_interval
+                );
+            $this->add(Html::p($msg));
+        }
+
+        if ($job->ts_last_attempt) {
+            if ($job->last_attempt_succeeded) {
+                $this->add(Html::p(sprintf(
+                    $this->translate('The last attempt succeeded at %s'),
+                    $job->ts_last_attempt
+                )));
+            } else {
+                $this->add(Html::p(['class' => 'error'], sprintf(
+                    $this->translate('The last attempt failed at %s: %s'),
+                    $job->ts_last_attempt,
+                    $job->ts_last_error
+                )));
+            }
+        } else {
+            $this->add(Html::p($this->translate('This job has not been executed yet')));
+        }
+    }
+}