diff --git a/templates/job/edit.html.twig b/templates/job/edit.html.twig
index 2a063a2..53940a5 100644
--- a/templates/job/edit.html.twig
+++ b/templates/job/edit.html.twig
@@ -77,9 +77,9 @@
                 {% endif %}
             </button>
             <div class="dropdown-menu" aria-labelledby="crontypeButton">
-                <a class="dropdown-item crontype-item" href="#" data-type="command">Command</a>
-                <a class="dropdown-item crontype-item" href="#" data-type="reboot">Reboot</a>
-                <a class="dropdown-item crontype-item" href="#" data-type="http">Http request</a>
+                <a class="dropdown-item crontype-item" href="#" data-type="command">{{ 'job.addedit.crontype.command.label' | trans }}</a>
+                <a class="dropdown-item crontype-item" href="#" data-type="reboot">{{ 'job.addedit.crontype.reboot.label' | trans }}</a>
+                <a class="dropdown-item crontype-item" href="#" data-type="http">{{ 'job.addedit.crontype.http.label' | trans }}</a>
             </div>
         </div>
 
@@ -123,44 +123,44 @@
     <div class="crontype-command crontype-inputs croncategory-inputs{% if job.data.crontype != 'command' %} d-none{% endif %}">
         <h4>{{ "job.addedit.crontype.command.header"| trans }}</h4>
         <div class="mb-3">
-            <label for="command">{{ "job.addedit.crontype.command.command.label"| trans }}</label>
+            <label for="command">{{ "job.addedit.crontype.command.command.label" | trans }}</label>
             <input type="text" name="command" class="form-control" id="command" placeholder="{{ "job.addedit.crontype.command.command.placeholder"| trans }}" value="{% if job.data.command is defined %}{{ job.data.command }}{% endif %}">
         </div>
 
         <div class="mb-3">
-            <label for="response">{{ "job.addedit.crontype.command.response.label"| trans }}</label>
+            <label for="response">{{ "job.addedit.crontype.command.response.label" | trans }}</label>
             <input type="text" name="response" class="form-control" id="response" placeholder="{{ "job.addedit.crontype.command.response.placeholder"| trans }}" value="{% if job.data.response is defined %}{{ job.data.response | join(',') }}{% endif %}">
         </div>
     </div>
 
     <div class="crontype-reboot crontype-inputs croncategory-inputs{% if job.data.crontype != 'reboot' %} d-none{% endif %}">
-        <h4>Reboot job details</h4>
+        <h4>{{ "job.addedit.crontype.reboot.header" | trans }}</h4>
         <div class="mb-3">
-            <label for="reboot-command">Reboot command</label>
-            <input type="text" name="reboot-command" class="form-control" id="reboot-command" placeholder="systemctl reboot" value="{% if attribute(job.data, 'reboot-command') is defined %}{{ attribute(job.data, 'reboot-command') }}{% endif %}">
-            <small id="reboot-command-help" class="form-text text-muted">Use {reboot-delay} or {reboot-delay-secs} to add the delay in your command</small>
+            <label for="reboot-command">{{ "job.addedit.crontype.reboot.reboot.command.label" | trans }}</label>
+            <input type="text" name="reboot-command" class="form-control" id="reboot-command" placeholder="{{ "job.addedit.crontype.reboot.reboot.command.placeholder" | trans }}" value="{% if attribute(job.data, 'reboot-command') is defined %}{{ attribute(job.data, 'reboot-command') }}{% endif %}">
+            <small id="reboot-command-help" class="form-text text-muted">{{ "job.addedit.crontype.reboot.reboot.command.helptext" | trans }}</small>
         </div>
 
         <div class="mb-3">
-            <label for="getservices-command">Get services command</label>
-            <input type="text" name="getservices-command" class="form-control" id="getservices)command" placeholder="systemctl list-units" value="{% if attribute(job.data, 'getservices-command') is defined %}{{ attribute(job.data, 'getservices-command') }}{% endif %}">
+            <label for="getservices-command">{{ "job.addedit.crontype.reboot.getservices.command.label" | trans }}</label>
+            <input type="text" name="getservices-command" class="form-control" id="getservices-command" placeholder="{{ "job.addedit.crontype.reboot.getservices.command.placeholder" | trans }}" value="{% if attribute(job.data, 'getservices-command') is defined %}{{ attribute(job.data, 'getservices-command') }}{% endif %}">
         </div>
 
         <div class="mb-3">
-            <label for="getservices-response">Get services command exit code</label>
-            <input type="text" name="getservices-response" class="form-control" id="getservices-response" placeholder="0" value="{% if attribute(job.data, 'getservices-response') is defined %}{{ attribute(job.data, 'getservices-response') | join(',') }}{% endif %}">
+            <label for="getservices-response">{{ "job.addedit.crontype.reboot.getservices.response.label" | trans }}</label>
+            <input type="text" name="getservices-response" class="form-control" id="getservices-response" placeholder="{{ "job.addedit.crontype.reboot.getservices.command.placeholder" | trans }}" value="{% if attribute(job.data, 'getservices-response') is defined %}{{ attribute(job.data, 'getservices-response') | join(',') }}{% endif %}">
         </div>
 
         <div class="mb-3">
-            <label for="reboot-delay">Reboot delay (in minutes)</label>
-            <input type="number" name="reboot-delay" class="form-control" placeholder="5" value="{% if attribute(job.data, 'reboot-delay') is defined %}{{ attribute(job.data, 'reboot-delay') }}{% endif %}">
-            <small id="reboot-delay-help" class="form-text text-muted">Delay between triggering reboot and actual reboot</small>
+            <label for="reboot-delay">{{ "job.addedit.crontype.reboot.reboot.delay.label" | trans }}</label>
+            <input type="number" name="reboot-delay" class="form-control" placeholder="{{ "job.addedit.crontype.reboot.reboot.delay.placeholder" | trans }}" value="{% if attribute(job.data, 'reboot-delay') is defined %}{{ attribute(job.data, 'reboot-delay') }}{% endif %}">
+            <small id="reboot-delay-help" class="form-text text-muted">{{ "job.addedit.crontype.reboot.reboot.delay.helptext" | trans }}</small>
         </div>
 
         <div class="mb-3">
-            <label for="reboot-duration">Reboot duration (in minutes)</label>
-            <input type="number" name="reboot-duration" class="form-control" placeholder="10" value="{% if attribute(job.data, 'reboot-duration') is defined %}{{ attribute(job.data, 'reboot-duration') }}{% endif %}">
-            <small id="reboot-duration-help" class="form-text text-muted">The amount of time the system takes to actually reboot</small>
+            <label for="reboot-duration">{{ "job.addedit.crontype.reboot.reboot.duration.label" | trans }}</label>
+            <input type="number" name="reboot-duration" class="form-control" placeholder="{{ "job.addedit.crontype.reboot.reboot.duration.placeholder" | trans }}" value="{% if attribute(job.data, 'reboot-duration') is defined %}{{ attribute(job.data, 'reboot-duration') }}{% endif %}">
+            <small id="reboot-duration-help" class="form-text text-muted">{{ "job.addedit.crontype.reboot.reboot.duration.helptext" | trans }}</small>
         </div>
     </div>
 
diff --git a/translations/messages.en.yaml b/translations/messages.en.yaml
index 932b1c7..d5bb5b5 100644
--- a/translations/messages.en.yaml
+++ b/translations/messages.en.yaml
@@ -48,55 +48,76 @@ job:
         failed: "No failed runs found"
         all: "No runs found"
   edit:
-    title: 'Edit job'
-    header: 'Edit job _jobname_'
+    title: "Edit job"
+    header: "Edit job _jobname_"
   add:
-    title: 'Add job'
-    header: 'Add new job'
+    title: "Add job"
+    header: "Add new job"
   addedit:
     generalinfo:
-      header: 'General info'
+      header: "General info"
       name:
-        label: 'Name'
-        placeholder: 'System update'
-        helptext: 'You can create colored tags by using [tag]'
+        label: "Name"
+        placeholder: "System update"
+        helptext: "You can create colored tags by using [tag]"
       interval:
-        label: 'Interval (in seconds)'
-        placeholder: '3600'
+        label: "Interval (in seconds)"
+        placeholder: "3600"
         patterns:
-          label: 'Patterns'
-          minute: 'Every minute'
-          hour: 'Every hour'
-          day: 'Every day'
-          week: 'Every week'
-          4week: 'Every 4 weeks'
+          label: "Patterns"
+          minute: "Every minute"
+          hour: "Every hour"
+          day: "Every day"
+          week: "Every week"
+          4week: "Every 4 weeks"
       nextrun:
-        label: 'Next run'
+        label: "Next run"
       lastrun:
-        label: 'Last run'
+        label: "Last run"
         eternal:
-          label: 'Eternal'
+          label: "Eternal"
       retention:
-        label: 'Retention (in days)'
-        placeholder: '7'
-        helptext: 'How many days (at least) to keep runs of this job in the database'
+        label: "Retention (in days)"
+        placeholder: "7"
+        helptext: "How many days (at least) to keep runs of this job in the database"
       failpercentage:
-        label: 'Max fail percentage'
+        label: "Max fail percentage"
       faildays:
-        label: 'Number of days calculated for fail percentage'
-        placeholder: '7'
-  crontype:
-    label: Job type
-    command:
-      label: Command
-      header: Command details
+        label: "Number of days calculated for fail percentage"
+        placeholder: "7"
+    crontype:
+      label: "Job type"
       command:
-        label: Command
-        placeholder: sudo apt update
-      response:
-        label: Expected exit code
-        placeholder: 0
-    reboot:
-      label: Reboot
-    http:
-      label: HTTP request
\ No newline at end of file
+        label: "Command"
+        header: "Command details"
+        command:
+          label: "Command"
+          placeholder: "sudo apt update"
+        response:
+          label: "Expected exit code"
+          placeholder: "0"
+      reboot:
+        label: "Reboot"
+        header: "Reboot job details"
+        reboot:
+          command:
+            label: "Reboot command"
+            placeholder: "systemctl reboot"
+            helptext: "Use {reboot-delay} or {reboot-delay-secs} to add the delay in your command"
+          delay:
+            label: "Reboot delay (in minutes)"
+            placeholder: "5"
+            helptext: "Delay between triggering reboot and actual reboot"
+          duration:
+            label: "Reboot duration (in minutes)"
+            placeholder: "10"
+            helptext: "The amount of time the system takes to actually reboot"
+        getservices:
+          command:
+            label: "Get services command"
+            placeholder: "systemctl list-units"
+          response:
+            label: "Get services command exit code"
+            placeholder: "0"
+      http:
+        label: "HTTP request"
\ No newline at end of file
diff --git a/translations/messages.nl.yaml b/translations/messages.nl.yaml
index 6c727dc..6703803 100644
--- a/translations/messages.nl.yaml
+++ b/translations/messages.nl.yaml
@@ -48,55 +48,76 @@ job:
         failed: "Geen gefaalde uitvoeringen gevonden"
         all: "Geen uitvoeringen gevonden"
   edit:
-    title: 'Bewerk taak'
-    header: 'Bewerk taak _jobname_'
+    title: "Bewerk taak"
+    header: "Bewerk taak _jobname_"
   add:
-    title: 'Taak toevoegen'
-    header: 'Nieuwe taak toevoegen'
+    title: "Taak toevoegen"
+    header: "Nieuwe taak toevoegen"
   addedit:
     generalinfo:
-      header: 'Algemene info'
+      header: "Algemene info"
       name:
-        label: 'Naam'
-        placeholder: 'Systemen updaten'
-        helptext: 'Je kan gekleurde tags toevoegen met [tag]'
+        label: "Naam"
+        placeholder: "Systemen updaten"
+        helptext: "Je kan gekleurde tags toevoegen met [tag]"
       interval:
-        label: 'Interval (in seconden)'
-        placeholder: '3600'
+        label: "Interval (in seconden)"
+        placeholder: "3600"
         patterns:
-          label: 'Patronen'
-          minute: 'Iedere minuut'
-          hour: 'Ieder uur'
-          day: 'Iedere dag'
-          week: 'Iedere week'
-          4week: 'Iedere 4 weken'
+          label: "Patronen"
+          minute: "Iedere minuut"
+          hour: "Ieder uur"
+          day: "Iedere dag"
+          week: "Iedere week"
+          4week: "Iedere 4 weken"
       nextrun:
-        label: 'Volgende uitvoering'
+        label: "Volgende uitvoering"
       lastrun:
-        label: 'Laatste uitvoering'
+        label: "Laatste uitvoering"
         eternal:
-          label: 'Eeuwig'
+          label: "Eeuwig"
       retention:
-        label: 'Opslag (in dagen)'
-        placeholder: '7'
-        helptext: 'Hoeveel dagen moeten uitvoeringen van een job bewaard worden'
+        label: "Opslag (in dagen)"
+        placeholder: "7"
+        helptext: "Hoeveel dagen moeten uitvoeringen van een job bewaard worden"
       failpercentage:
-        label: 'Max faalpercentage'
+        label: "Max faalpercentage"
       faildays:
-        label: 'Aantal dagen berekend voor faalpercentage'
-        placeholder: '7'
+        label: "Aantal dagen berekend voor faalpercentage"
+        placeholder: "7"
     crontype:
-      label: Taak type
+      label: "Taak type"
       command:
-        label: Commando
-        header: Commando details
+        label: "Commando"
+        header: "Commando details"
         command:
-          label: Commando
-          placeholder: sudo apt update
+          label: "Commando"
+          placeholder: "sudo apt update"
         response:
-          label: Verwacht resultaat
-          placeholder: 0
+          label: "Verwacht resultaat"
+          placeholder: "0"
       reboot:
-        label: Herstart
+        label: "Herstart"
+        header: "Herstart details"
+        reboot:
+          command:
+            label: "Herstart commando"
+            placeholder: "systemctl reboot"
+            helptext: "Gebruik {reboot-delay} of {reboot-delay-secs} om de vertraging toe te voegen in je commando"
+          delay:
+            label: "Herstart vertraging (in minuten)"
+            placeholder: "5"
+            helptext: "Tijd tussen het aanroepen van herstart commando en de eigenlijke herstart"
+          duration:
+            label: "Duurtijd van herstart (in minuten)"
+            placeholder: "10"
+            helptext: "De tijd dat de effectieve herstart duurt"
+        getservices:
+          command:
+            label: "Commando voor ophalen services"
+            placeholder: "systemctl list-units"
+          response:
+            label: "Resultaat van commando voor ophalen services"
+            placeholder: "0"
       http:
         label: HTTP request