diff --git a/templates/admin/application/index.html.twig b/templates/admin/application/index.html.twig
index b514bae..21d377e 100644
--- a/templates/admin/application/index.html.twig
+++ b/templates/admin/application/index.html.twig
@@ -15,10 +15,10 @@
                             {{ knp_pagination_sortable(pagination, 'Einsatz­zeitraum', 'destination.dateFrom') }}
                         </th>
                         <th>
-                            {{ knp_pagination_sortable(pagination, 'Jobprofil', 'job_profile.name') }}
+                            {{ knp_pagination_sortable(pagination, 'Destination', 'destination.product') }}
                         </th>
                         <th>
-                            {{ knp_pagination_sortable(pagination, 'Destination', 'destination.product') }}
+                            {{ knp_pagination_sortable(pagination, 'Jobprofil', 'job_profile.name') }}
                         </th>
                         <th>
                             {{ knp_pagination_sortable(pagination, 'Bus', 'destination.pickup') }}
@@ -39,6 +39,17 @@
                                         {{ assignment.effectivePeriod.end|date('d.m.Y') }}
                                     </a>
                                 </td>
+                                <td>
+                                    <a href="{{ path('app_admin_assignment_detail', { 'uuid': assignment.uuid, 'r': return_url() }) }}"
+                                       class="flex items-start space-x-2">
+                                        {{ icon('flag-' ~ assignment.destination.country, 'w-5 h-5 shrink-0') }}
+                                        <div class="flex-1">
+                                            {{ assignment.destination.product }}
+                                            <br>
+                                            {{ assignment.destination.hotel }}
+                                        </div>
+                                    </a>
+                                </td>
                                 <td>
                                     <a href="{{ path('app_admin_assignment_detail', { 'uuid': assignment.uuid, 'r': return_url() }) }}">
                                         {{ assignment.jobProfile.name }}
@@ -46,17 +57,10 @@
                                 </td>
                                 <td>
                                     <a href="{{ path('app_admin_assignment_detail', { 'uuid': assignment.uuid, 'r': return_url() }) }}">
-                                        {{ assignment.destination.product }}
-                                        <br>
-                                        {{ assignment.destination.hotel }}
-                                        </a>
-                                </td>
-                                <td>
-                                    <a href="{{ path('app_admin_assignment_detail', { 'uuid': assignment.uuid, 'r': return_url() }) }}">
-                                        {{ assignment.pickup ? assignment.pickup|bpn_pickup_label : '-' }}
+                                        <span class="whitespace-nowrap">{{ assignment.pickup ? assignment.pickup|bpn_pickup_label : '-' }}</span>
                                         <br>
                                         {{ assignment.effectivePickupDate ? assignment.effectivePickupDate|date('d.m.Y') : '' }}
-                                        </a>
+                                    </a>
                                 </td>
                                 <td>
                                     <a href="{{ path('app_admin_assignment_detail', { 'uuid': assignment.uuid, 'r': return_url() }) }}">
diff --git a/templates/admin/assignment/index.html.twig b/templates/admin/assignment/index.html.twig
index 339ee3b..1274889 100644
--- a/templates/admin/assignment/index.html.twig
+++ b/templates/admin/assignment/index.html.twig
@@ -15,10 +15,10 @@
                         {{ knp_pagination_sortable(pagination, 'Einsatz&shy;zeitraum', 'destination.dateFrom') }}
                     </th>
                     <th>
-                        {{ knp_pagination_sortable(pagination, 'Jobprofil', 'job_profile.name') }}
+                        {{ knp_pagination_sortable(pagination, 'Destination', 'destination.product') }}
                     </th>
                     <th>
-                        {{ knp_pagination_sortable(pagination, 'Destination', 'destination.product') }}
+                        {{ knp_pagination_sortable(pagination, 'Jobprofil', 'job_profile.name') }}
                     </th>
                     <th>
                         {{ knp_pagination_sortable(pagination, 'Bus', 'assignment.pickup') }}
@@ -39,6 +39,17 @@
                                 {{ assignment.effectivePeriod.end|date('d.m.Y') }}
                             </a>
                         </td>
+                        <td>
+                            <a href="{{ path('app_admin_assignment_detail', { 'uuid': assignment.uuid, 'r': return_url() }) }}"
+                               class="flex items-start space-x-2">
+                                {{ icon('flag-' ~ assignment.destination.country, 'w-5 h-5 shrink-0') }}
+                                <div class="flex-1">
+                                    {{ assignment.destination.product }}
+                                    <br>
+                                    {{ assignment.destination.hotel }}
+                                </div>
+                            </a>
+                        </td>
                         <td>
                             <a href="{{ path('app_admin_assignment_detail', { 'uuid': assignment.uuid, 'r': return_url() }) }}">
                                 {{ assignment.jobProfile.name }}
@@ -46,14 +57,7 @@
                         </td>
                         <td>
                             <a href="{{ path('app_admin_assignment_detail', { 'uuid': assignment.uuid, 'r': return_url() }) }}">
-                                {{ assignment.destination.product }}
-                                <br>
-                                {{ assignment.destination.hotel }}
-                            </a>
-                        </td>
-                        <td>
-                            <a href="{{ path('app_admin_assignment_detail', { 'uuid': assignment.uuid, 'r': return_url() }) }}">
-                                {{ assignment.pickup ? assignment.pickup|bpn_pickup_label|default('-') : '-' }}
+                                <span class="whitespace-nowrap">{{ assignment.pickup ? assignment.pickup|bpn_pickup_label : '-' }}</span>
                                 <br>
                                 {{ assignment.effectivePickupDate ? assignment.effectivePickupDate|date('d.m.Y') : '' }}
                             </a>
diff --git a/templates/admin/document/index.html.twig b/templates/admin/document/index.html.twig
index 7f5acd6..2a5c9f6 100644
--- a/templates/admin/document/index.html.twig
+++ b/templates/admin/document/index.html.twig
@@ -12,14 +12,14 @@
                     <thead>
                     <tr>
                         <th>
-                            {{ knp_pagination_sortable(pagination, 'Einsatzzeitraum', 'destination.dateFrom') }}
-                        </th>
-                        <th>
-                            {{ knp_pagination_sortable(pagination, 'Jobprofil', 'job_profile.name') }}
+                            {{ knp_pagination_sortable(pagination, 'Einsatz&shy;zeitraum', 'destination.dateFrom') }}
                         </th>
                         <th>
                             {{ knp_pagination_sortable(pagination, 'Destination', 'destination.product') }}
                         </th>
+                        <th>
+                            {{ knp_pagination_sortable(pagination, 'Jobprofil', 'job_profile.name') }}
+                        </th>
                         <th>
                             {{ knp_pagination_sortable(pagination, 'Dokument', 'upload.type') }}
                         </th>
@@ -43,12 +43,17 @@
                                     {{ assignment.destination.dateTo|date('d.m.Y') }}
                                 </td>
                                 <td>
-                                    {{ assignment.jobProfile.name }}
+                                    <div class="flex items-start space-x-2">
+                                        {{ icon('flag-' ~ assignment.destination.country, 'w-5 h-5 shrink-0') }}
+                                        <div class="flex-1">
+                                            {{ assignment.destination.product }}
+                                            <br>
+                                            {{ assignment.destination.hotel }}
+                                        </div>
+                                    </div>
                                 </td>
                                 <td>
-                                    {{ assignment.destination.product }}
-                                    <br>
-                                    {{ assignment.destination.hotel }}
+                                    {{ assignment.jobProfile.name }}
                                 </td>
                                 <td>
                                     {{ ('label.document.type.' ~ upload.type)|trans }}