diff --git a/frontend/src/pages/ticket.rs b/frontend/src/pages/ticket.rs
index a8f2b7b..869500e 100644
--- a/frontend/src/pages/ticket.rs
+++ b/frontend/src/pages/ticket.rs
@@ -666,8 +666,11 @@ pub fn all_tickets_component() -> Html {
     } else {
         html! {
             <div>
+                <div class="page-header">
+                    <h1>{ "All Tickets" }</h1>
+                </div>
                 <ul class="ticket-list">
-                { for tickets.iter().filter(|t| t.status != "Archived" (if user.is_admin { true } else if let Some(uid) = user.id { t.user_id == uid } else { false })).map(|t| {
+                { for tickets.iter().filter(|t| t.status != "Archived" && (if user.is_admin { true } else if let Some(uid) = user.id { t.user_id == uid } else { false })).map(|t| {
                         let status_class = match t.status.as_str() {
                             "ToDo" => "To-Do",
                             "InProgress" => "InProgress",
@@ -802,24 +805,30 @@ pub fn archived_tickets_component() -> Html {
         html! { <p>{ format!("Error: {}", e) }</p> }
     } else {
         html! {
-            <ul>
-            { for tickets.iter().filter(|t| t.status == "Archived" && (user.is_admin || if let Some(uid) = user.id { t.user_id == uid } else { false })).map(|t| html! {
-                    <div>
-                        <li key={t.id.to_string()}>
-                            <Link<crate::Route> to={crate::Route::TicketById{id: t.id}}><h3>{ format!("{} - #{}", t.betreff, t.id) }</h3></Link<crate::Route>>
-                            <p>{ &t.description }</p>
-                            <p>{ match t.status.as_str() {
-                                "ToDo" => "Zu tun",
-                                "InProgress" => "In Bearbeitung",
-                                "Completed" => "Erledigt",
-                                "Archived" => "Archiviert",
-                                _ => "Ungültiger Status"
-                            }}</p>
-                        </li>
+            <div>
+                <div class="page-header">
+                                <h1>{ "Archivierte Tickets" }</h1>
+                            </div>
+                <ul class="ticket-list">
+                { for tickets.iter().filter(|t| t.status == "Archived" && (user.is_admin || if let Some(uid) = user.id { t.user_id == uid } else { false })).map(|t| html! {
+                        <div>
 
-                    </div>
-                })}
-            </ul>
+                            <li key={t.id.to_string()}>
+                                <Link<crate::Route> to={crate::Route::TicketById{id: t.id}}><h3>{ format!("{} - #{}", t.betreff, t.id) }</h3></Link<crate::Route>>
+                                <p>{ &t.description }</p>
+                                <p>{ match t.status.as_str() {
+                                    "ToDo" => "Zu tun",
+                                    "InProgress" => "In Bearbeitung",
+                                    "Completed" => "Erledigt",
+                                    "Archived" => "Archiviert",
+                                    _ => "Ungültiger Status"
+                                }}</p>
+                            </li>
+
+                        </div>
+                    })}
+                </ul>
+            </div>
         }
     }
 }