diff --git a/src/Controller/Administrative/Assignment/DuplicateController.php b/src/Controller/Administrative/Assignment/DuplicateController.php
index c2e89f4..645d059 100644
--- a/src/Controller/Administrative/Assignment/DuplicateController.php
+++ b/src/Controller/Administrative/Assignment/DuplicateController.php
@@ -2,6 +2,7 @@
 
 namespace App\Controller\Administrative\Assignment;
 
+use App\Controller\Traits\ReturnUrlTrait;
 use App\Entity\Assignment;
 use App\Form\AssignmentType;
 use Doctrine\ORM\EntityManagerInterface;
@@ -14,6 +15,8 @@ use Symfony\Component\Security\Http\Attribute\IsGranted;
 
 class DuplicateController extends AbstractController
 {
+    use ReturnUrlTrait;
+
     public function __construct(
         private readonly EntityManagerInterface $entityManager,
         private readonly LoggerInterface $logger
@@ -24,6 +27,8 @@ class DuplicateController extends AbstractController
     #[IsGranted('ROLE_ADMINISTRATIVE')]
     public function index(Assignment $assignment, Request $request): Response
     {
+        $returnUrl = $this->getReturnUrl($request, 'app_administrative_assignment_index');
+
         $copy = Assignment::duplicate($assignment);
 
         $form = $this->createForm(
@@ -54,7 +59,9 @@ class DuplicateController extends AbstractController
         }
 
         return $this->render('administrative/assignment/duplicate.html.twig', [
+            'assignment' => $assignment,
             'form' => $form->createView(),
+            'returnUrl' => $returnUrl,
         ]);
     }
 }
\ No newline at end of file
diff --git a/src/Controller/Administrative/Assignment/EditController.php b/src/Controller/Administrative/Assignment/EditController.php
index 156bad4..cefaba2 100644
--- a/src/Controller/Administrative/Assignment/EditController.php
+++ b/src/Controller/Administrative/Assignment/EditController.php
@@ -53,6 +53,7 @@ class EditController extends AbstractController
         }
 
         return $this->render('administrative/assignment/edit.html.twig', [
+            'assignment' => $assignment,
             'form' => $form->createView(),
             'returnUrl' => $returnUrl,
         ]);
diff --git a/templates/administrative/assignment/duplicate.html.twig b/templates/administrative/assignment/duplicate.html.twig
index 9679b04..cd8dfeb 100644
--- a/templates/administrative/assignment/duplicate.html.twig
+++ b/templates/administrative/assignment/duplicate.html.twig
@@ -4,7 +4,7 @@
 
 {% block content %}
     <h1 class="text-2xl font-bold pb-8">
-        Einsatz duplizieren
+        Einsatz duplizieren #{{ assignment.id }}
     </h1>
     {% include 'administrative/assignment/_form.html.twig' %}
 {% endblock %}
\ No newline at end of file
diff --git a/templates/administrative/assignment/edit.html.twig b/templates/administrative/assignment/edit.html.twig
index 8b1f437..b7a12e7 100644
--- a/templates/administrative/assignment/edit.html.twig
+++ b/templates/administrative/assignment/edit.html.twig
@@ -4,7 +4,7 @@
 
 {% block content %}
     <h1 class="text-2xl font-bold pb-8">
-        Einsatz bearbeiten
+        Einsatz bearbeiten #{{ assignment.id }}
     </h1>
     {% include 'administrative/assignment/_form.html.twig' %}
 {% endblock %}
\ No newline at end of file
diff --git a/templates/administrative/assignment/index.html.twig b/templates/administrative/assignment/index.html.twig
index f38fc21..f6a354c 100644
--- a/templates/administrative/assignment/index.html.twig
+++ b/templates/administrative/assignment/index.html.twig
@@ -34,6 +34,9 @@
             <table class="data-table">
                 <thead>
                 <tr>
+                    <th>
+                        ID
+                    </th>
                     <th>
                         Status
                     </th>
@@ -63,6 +66,9 @@
                 <tbody>
                 {% for assignment in pagination %}
                     <tr>
+                        <td>
+                            {{ assignment.id }}
+                        </td>
                         <td>
                             <div class="flex flex-col items-center space-y-2">
                                 {% if assignment.status == 'draft' %}