diff --git a/src/Controller/JobController.php b/src/Controller/JobController.php
index 4130d90..49bdde4 100644
--- a/src/Controller/JobController.php
+++ b/src/Controller/JobController.php
@@ -91,15 +91,15 @@ class JobController extends AbstractController
                 $return = [
                     'status' => 'deferred',
                     'success' => NULL,
-                    'title' => $translator->trans('job.runnow.deferred.title'),
-                    'message' => $translator->trans('job.runnow.deferred.message')
+                    'title' => $translator->trans('job.view.runnow.deferred.title'),
+                    'message' => $translator->trans('job.view.runnow.deferred.message')
                 ];
             } else {
                 $return = [
                     'status' => 'ran',
                     'success' => $runnowResult['success'],
-                    'title' => $runnowResult['success'] ? $translator->trans('job.runnow.ran.title.success') : $translator->trans('job.runnow.ran.title.failed'),
-                    'message' => $translator->trans('job.runnow.ran.message', [
+                    'title' => $runnowResult['success'] ? $translator->trans('job.view.runnow.ran.title.success') : $translator->trans('job.view.runnow.ran.title.failed'),
+                    'message' => $translator->trans('job.view.runnow.ran.message', [
                         '_runtime_' => number_format($runnowResult['runtime'], 3),
                         '_exitcode_' => $runnowResult['exitcode']
                     ]),
diff --git a/templates/job/view.html.twig b/templates/job/view.html.twig
index c714927..f8bbdde 100644
--- a/templates/job/view.html.twig
+++ b/templates/job/view.html.twig
@@ -1,11 +1,11 @@
 {% extends "base.html.twig" %}
 {% block title %}{{ 'job.title' | trans({ '_jobname_': job.name }) }}{% endblock %}
 {% block content %}
-    <h2>{{ 'job.header' | trans({ '_jobname_': (job.name  | parsetags) })  | raw }}</h2>
+    <h2>{{ 'job.view.header' | trans({ '_jobname_': (job.name  | parsetags) })  | raw }}</h2>
     <p>
-        <a href="{{ path('job_edit', { id: job.id }) }}">{{ 'job.edit' | trans }}</a>
-        {% if allruns %} | <a href="{{ path('job_view', { id: job.id })}}">{{ 'job.show.onlyfailed' | trans }}</a>
-        {% elseif not allruns %} | <a href="{{ path('job_view', { id: job.id, all: 'all' })}}">{{ 'job.show.all' | trans }}</a>
+        <a href="{{ path('job_edit', { id: job.id }) }}">{{ 'job.view.edit' | trans }}</a>
+        {% if allruns %} | <a href="{{ path('job_view', { id: job.id })}}">{{ 'job.view.show.onlyfailed' | trans }}</a>
+        {% elseif not allruns %} | <a href="{{ path('job_view', { id: job.id, all: 'all' })}}">{{ 'job.view.show.all' | trans }}</a>
         {% endif %}
     </p>
     <div id="runs" class="accordion">
@@ -15,9 +15,9 @@
                     <button class="accordion-button{% if loop.index != 1 %} collapsed{% endif %}" type="button" data-bs-toggle="collapse" data-bs-target="#run-{{ run.id }}" aria-expanded="{% if loop.index != 1 %}true{% else %}false{% endif %}" aria-controls="run-{{ run.id }}">
                         <div>
                             <div class="d-md-inline d-block text-left">{{ run.timestamp | date("d/m/Y H:i:s") }}</div>
-                            <div class="d-md-inline d-block text-left">({{ "job.results.exitcode"| trans }}: {{ run.exitcode }} | {{ "job.results.runtime"| trans }}: {{ run.runtime | interval }})</div>
+                            <div class="d-md-inline d-block text-left">({{ "job.view.results.exitcode"| trans }}: {{ run.exitcode }} | {{ "job.view.results.runtime"| trans }}: {{ run.runtime | interval }})</div>
                             {% if 'M' in run.flags %}
-                                <div class="d-md-inline d-block text-left">{{ "job.results.manual"| trans }}</div>
+                                <div class="d-md-inline d-block text-left">{{ "job.view.results.manual"| trans }}</div>
                             {% endif %}
                         </div>
                     </button>
@@ -29,8 +29,8 @@
                 </div>
             </div>
         {% else %}
-            <h4>{% if not allruns %}{{ "job.results.noresults.failed" | trans }}{% else %}{{ "job.results.noresults.all"| trans }}{% endif %}</h4>
-            <p><a href="{{ path('job_view', { id: job.id, all: 'all' })}}">{{ 'job.show.all' | trans }}</a></p>
+            <h4>{% if not allruns %}{{ "job.view.results.noresults.failed" | trans }}{% else %}{{ "job.view.results.noresults.all"| trans }}{% endif %}</h4>
+            <p><a href="{{ path('job_view', { id: job.id, all: 'all' })}}">{{ 'job.view.show.all' | trans }}</a></p>
         {% endfor %}
     </div>
 {% endblock %}
diff --git a/translations/messages.en.yaml b/translations/messages.en.yaml
index fd97fba..ef974f4 100644
--- a/translations/messages.en.yaml
+++ b/translations/messages.en.yaml
@@ -24,25 +24,26 @@ index:
       interval: "Interval"
       nextrun: "Nextrun"
 job:
-  title: "Overview of runs for _jobname_"
-  header: "Overview of runs for _jobname_"
-  edit: "Edit job"
-  runnow:
-    deferred:
-      title: "Cronjob has been scheduled"
-      message: "Job was scheduled to be run. You will find the output soon in the job details"
-    ran:
-      title:
-        success: "Cronjob succesfully ran"
-        failed: "Cronjob failed. Please check output below"
-      message: "Cronjob ran in _runtime_ seconds with exit code _exitcode_"
-  show:
-    onlyfailed: "Only show failed runs"
-    all: "Show all runs"
-  results:
-    exitcode: "Exit code"
-    runtime: "Runtime"
-    manual: "Manual run"
-    noresults:
-      failed: "No failed runs found"
-      all: "No runs found"
\ No newline at end of file
+  view:
+    title: "Overview of runs for _jobname_"
+    header: "Overview of runs for _jobname_"
+    edit: "Edit job"
+    runnow:
+      deferred:
+        title: "Cronjob has been scheduled"
+        message: "Job was scheduled to be run. You will find the output soon in the job details"
+      ran:
+        title:
+          success: "Cronjob succesfully ran"
+          failed: "Cronjob failed. Please check output below"
+        message: "Cronjob ran in _runtime_ seconds with exit code _exitcode_"
+    show:
+      onlyfailed: "Only show failed runs"
+      all: "Show all runs"
+    results:
+      exitcode: "Exit code"
+      runtime: "Runtime"
+      manual: "Manual run"
+      noresults:
+        failed: "No failed runs found"
+        all: "No runs found"
\ No newline at end of file
diff --git a/translations/messages.nl.yaml b/translations/messages.nl.yaml
index 0490c6d..7099d43 100644
--- a/translations/messages.nl.yaml
+++ b/translations/messages.nl.yaml
@@ -24,25 +24,26 @@ index:
       interval: "Interval"
       nextrun: "Volgende uitvoering"
 job:
-  title: "Overzicht van uitvoeringen van _jobname_"
-  header: "Overzicht van uitvoeringen van _jobname_"
-  edit: "Bewerk taak"
-  runnow:
-    deferred:
-      title: "Taak werd doorgestuurd naar de daemon"
-      message: "Taak werd doorgestuurd naar de daemon. De output vind u binnenkort in de taakdetails"
-    ran:
-      title:
-        success: "Taak werd succesvol uitgevoerd"
-        failed: "Taak faalde. Hieronder vind u de output ter controle"
-      message: "Taak werd in _runtime_ seconden uitgevoerd met resultaat _exitcode_"
-  show:
-    onlyfailed: "Toon alleen gefaalde uitvoeringen"
-    all: "Toon alle uitvoeringen"
-  results:
-    exitcode: "Resultaat"
-    runtime: "Duurtijd"
-    manual: "Manuele uitvoering"
-    noresults:
-      failed: "Geen gefaalde uitvoeringen gevonden"
-      all: "Geen uitvoeringen gevonden"
\ No newline at end of file
+  view:
+    title: "Overzicht van uitvoeringen van _jobname_"
+    header: "Overzicht van uitvoeringen van _jobname_"
+    edit: "Bewerk taak"
+    runnow:
+      deferred:
+        title: "Taak werd doorgestuurd naar de daemon"
+        message: "Taak werd doorgestuurd naar de daemon. De output vind u binnenkort in de taakdetails"
+      ran:
+        title:
+          success: "Taak werd succesvol uitgevoerd"
+          failed: "Taak faalde. Hieronder vind u de output ter controle"
+        message: "Taak werd in _runtime_ seconden uitgevoerd met resultaat _exitcode_"
+    show:
+      onlyfailed: "Toon alleen gefaalde uitvoeringen"
+      all: "Toon alle uitvoeringen"
+    results:
+      exitcode: "Resultaat"
+      runtime: "Duurtijd"
+      manual: "Manuele uitvoering"
+      noresults:
+        failed: "Geen gefaalde uitvoeringen gevonden"
+        all: "Geen uitvoeringen gevonden"
\ No newline at end of file