diff --git a/app/views/admin/jobs/index.html.erb b/app/views/admin/jobs/index.html.erb
index c36b705..0a68d02 100644
--- a/app/views/admin/jobs/index.html.erb
+++ b/app/views/admin/jobs/index.html.erb
@@ -1,54 +1,56 @@
 <% content_for :title, "Benutzerliste" %>
 <h1 class="font-bold text-4xl py-4 text-hsrm-gray">Alle Druckaufträge</h1>
-<div class="flex justify-between items-center">
+<% if @calendar %>
+  <%= link_to icon("magnifying-glass", class: "icon size-5 mr-3") + 'Filter', admin_jobs_path(), class: "px-4 py-2 hover:bg-gray-50 hover:text-hsrm-red border-b-4 hover:border-hsrm-red-light" %>
+  <%= content_tag :span, icon("calendar", class: "icon size-5 mr-3") + 'Kalender', class: "px-4 py-2 border-b-4 border-hsrm-red-light" %>
+  <div class="pt-2">
+    <%== pagy_nav(@calendar[:year]) %>
+    <%== pagy_nav(@calendar[:month]) if @calendar[:month] %>
+  </div>
+<% else %>
+  <%= content_tag :span, icon("magnifying-glass", class: "icon size-5 mr-3") + 'Filter', class: "px-4 py-2 border-b-4 border-hsrm-red-light" %>
+  <%= link_to icon("calendar", class: "icon size-5 mr-3") + 'Kalender', admin_jobs_path(calendar: true), class: "px-4 py-2 hover:text-hsrm-red border-b-4 hover:border-hsrm-red-light" %>
   <div class="flex items-center justify-between py-4">
-    <%= search_form_for @q, data: { turbo_frame: :admin_jobs, turbo_action: 'advance' }, url: admin_jobs_path do |f| %>
+    <%= search_form_for @q, data: { turbo_frame: :admin_jobs, turbo_action: 'advance' }, url: admin_jobs_path() do |f| %>
       <%= f.search_field :costumer_firstname_or_costumer_lastname_or_pdf_blob_filename_cont, placeholder: "Suchen", oninput: 'this.form.requestSubmit();' %>
       <%= f.label :status_eq, "Status:" %>
       <%= f.select :status_eq, Job.statuses.keys, {include_blank: "alle"}, onchange: 'this.form.requestSubmit();' %>
-      <%#= f. %>
       <%= f.submit "Filter anwenden", class: "py-2 px-3 bg-hsrm-red hover:bg-hsrm-red-light shadow-lg text-white inline-block font-medium cursor-pointer" %>
-    <% end %>
-  </div>
-</div>
-<%= turbo_frame_tag "admin_jobs", data: { turbo_action: 'advance'} do %>
-  <div>
-    <% if @calendar %>
-      <%= link_to 'Kalender ausblenden', admin_jobs_path() %>
-      <%== pagy_nav(@calendar[:year]) %>
-      <%== pagy_nav(@calendar[:month]) if @calendar[:month] %>
-    <% else %>
-      <%= link_to 'Kalender anzeigen', admin_jobs_path(calendar: true) %>
-    <% end %>
-    <%== pagy_nav(@pagy) %>
-    <%== pagy_info(@pagy, item_name: "Users") %>
-  </div>
-  <div class="min-w-full overflow-auto shadow-lg pt-2">
-    <table class="w-full py-8 table-auto">
-      <thead class="font-semibold tracking-wide bg-gray-200 border-b-2 border-gray-300 text text-hsrm-gray">
-        <tr>
-          <th class="w-1 p-2 py-3 text-center text-nowrap"><%= sort_link(@q, :id, "ID", ) %></th>
-          <th class="min-w-24 p-2 py-3 text-left"><%= sort_link(@q, :costumer_firstname, "Vorname") %></th>
-          <th class="min-w-24 p-2 py-3 text-left"><%= sort_link(@q, :costumer_lastname, "Nachname") %></th>
-          <th class="p-2 py-3 text-left"><%= sort_link(@q, :pdf_blob_filename, "PDF") %></th>
-          <th class="w-1 p-1 py-3 text-left text-nowrap"><%= sort_link(@q, :number_of_plans_a0, "A0") %></th>
-          <th class="w-1 p-1 py-3 text-left text-nowrap"><%= sort_link(@q, :number_of_plans_a1, "A1") %></th>
-          <th class="w-1 p-1 py-3 text-left text-nowrap"><%= sort_link(@q, :number_of_plans_a2, "A2") %></th>
-          <th class="w-1 p-1 py-3 text-left text-nowrap"><%= sort_link(@q, :number_of_plans_a3, "A3") %></th>
-          <th class="w-1 p-2 py-3 text-center text-nowrap"><%= sort_link(@q, :costum_qm_plan, "no DIN") %></th>
-          <th class="w-1 p-2 py-3 text-center"><%= sort_link(@q, :cost, "Kosten") %></th>
-          <th class="w-1 p-2 py-3 text-center text-nowrap"><%= sort_link(@q, :created_at, "Erstellt am") %></th>
-          <th class="w-1 p-2 py-3 text-center text-nowrap"><%= sort_link(@q, :created_at, "Bezahlt am") %></th>
-          <th class="w-1 p-2 py-3 text-center"><%= sort_link(@q, :status, "Status") %></th>
-        </tr>
-      </thead>
-      <tbody id='jobs' class="divide-y divivde-gray-300">
-        <%= render partial: "job_tr", collection: @records, as: :job, locals: { no_actions: true } %>
-      </tbody>
-    </table>
-  </div>
-  <div class="flex justify-between items-center">
-    <%== pagy_nav(@pagy) %>
-    <%== pagy_info(@pagy, item_name: "Users") %>
-  </div>
+    </div>
+  <% end %>
 <% end %>
+<div>
+  <%= turbo_frame_tag "admin_jobs", data: { turbo_action: 'advance'} do %>
+    <div class="flex justify-between items-center">
+      <%== pagy_nav(@pagy) %>
+      <%== pagy_info(@pagy, item_name: "Users") %>
+    </div>
+    <div class="min-w-full overflow-auto shadow-lg pt-2">
+      <table class="w-full py-8 table-auto">
+        <thead class="font-semibold tracking-wide bg-gray-200 border-b-2 border-gray-300 text text-hsrm-gray">
+          <tr>
+            <th class="w-1 p-2 py-3 text-center text-nowrap"><%= sort_link(@q, :id, "ID", ) %></th>
+            <th class="min-w-24 p-2 py-3 text-left"><%= sort_link(@q, :costumer_firstname, "Vorname") %></th>
+            <th class="min-w-24 p-2 py-3 text-left"><%= sort_link(@q, :costumer_lastname, "Nachname") %></th>
+            <th class="p-2 py-3 text-left"><%= sort_link(@q, :pdf_blob_filename, "PDF") %></th>
+            <th class="w-1 p-1 py-3 text-left text-nowrap"><%= sort_link(@q, :number_of_plans_a0, "A0") %></th>
+            <th class="w-1 p-1 py-3 text-left text-nowrap"><%= sort_link(@q, :number_of_plans_a1, "A1") %></th>
+            <th class="w-1 p-1 py-3 text-left text-nowrap"><%= sort_link(@q, :number_of_plans_a2, "A2") %></th>
+            <th class="w-1 p-1 py-3 text-left text-nowrap"><%= sort_link(@q, :number_of_plans_a3, "A3") %></th>
+            <th class="w-1 p-2 py-3 text-center text-nowrap"><%= sort_link(@q, :costum_qm_plan, "no DIN") %></th>
+            <th class="w-1 p-2 py-3 text-center"><%= sort_link(@q, :cost, "Kosten") %></th>
+            <th class="w-1 p-2 py-3 text-center text-nowrap"><%= sort_link(@q, :created_at, "Erstellt am") %></th>
+            <th class="w-1 p-2 py-3 text-center text-nowrap"><%= sort_link(@q, :created_at, "Bezahlt am") %></th>
+            <th class="w-1 p-2 py-3 text-center"><%= sort_link(@q, :status, "Status") %></th>
+          </tr>
+        </thead>
+        <tbody id='jobs' class="divide-y divivde-gray-300">
+          <%= render partial: "job_tr", collection: @records, as: :job, locals: { no_actions: true } %>
+        </tbody>
+      </table>
+    </div>
+    <div class="flex justify-between items-center">
+      <%== pagy_nav(@pagy) %>
+      <%== pagy_info(@pagy, item_name: "Users") %>
+    </div>
+  <% end %>
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 84f843b..1cd3dda 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -3,24 +3,24 @@
   <nav>
     <ul class="flex justify-center space-x-2 font-semibold items-color">
       <li class="relative">
-        <button class="px-4 py-2 cursor-default hover:text-hsrm-red border-b-4 <%= root_tab? && 'border-hsrm-red-light' %>">
+        <button class="px-4 py-2 cursor-default hover:text-hsrm-red border-b-4 <%= root_tab? && 'border-hsrm-red-light' || 'hover:border-hsrm-red-light' %>">
           <%= link_to "Aktuelle Druckaufträge", root_path %>
         </button>
       </li>
       <% if user_signed_in? %>
         <li class="relative">
-          <button class="px-4 py-2 cursor-default hover:text-hsrm-red border-b-4 <%= profile_tab? && 'border-hsrm-red-light' %>">
+          <button class="px-4 py-2 cursor-default hover:text-hsrm-red border-b-4 <%= profile_tab? && 'border-hsrm-red-light' || 'hover:border-hsrm-red-light' %>">
             <%= link_to "Profil", profile_path %>
           </button>
         </li>
         <% if (current_user.admin? || current_user.operator?) %>
           <li class="relative">
-            <button class="px-4 py-2 cursor-default <%= current_user.admin? && 'hover:text-hsrm-red' || 'text-hsrm-gray-light'  %> border-b-4 <%= admin_tab? && 'border-hsrm-red-light' %>">
+            <button class="px-4 py-2 cursor-default <%= current_user.admin? && 'hover:text-hsrm-red' || 'text-hsrm-gray-light'  %> border-b-4 <%= admin_tab? && 'border-hsrm-red-light' || 'hover:border-hsrm-red-light' %>">
               <%= link_to_if current_user.admin?, "Admin", admin_dashboard_path %>
             </button>
           </li>
           <li class="relative">
-            <button class="px-4 py-2 cursor-default hover:text-hsrm-red border-b-4 <%= operator_tab? && 'border-hsrm-red-light' %>">
+            <button class="px-4 py-2 cursor-default hover:text-hsrm-red border-b-4 <%= operator_tab? && 'border-hsrm-red-light' || 'hover:border-hsrm-red-light'  %>">
               <%= link_to 'Operator', operator_jobs_path  %>
             </button>
           </li>