diff --git a/frontend/src/pages/basic_pages.rs b/frontend/src/pages/basic_pages.rs
index 27c6b93..9ee7a23 100644
--- a/frontend/src/pages/basic_pages.rs
+++ b/frontend/src/pages/basic_pages.rs
@@ -31,8 +31,16 @@ pub fn home_component() -> Html {
 
     match *is_admin {
         None => html! { <div>{ "Loading..." }</div> },
-        Some(true) => html! { <div>{ "You are admin" }</div> },
-        Some(false) => html! {  <Redirect<crate::Route> to={crate::Route::Ticket}/> },
+        Some(true) => html! {
+            <div>
+                <crate::utilities::TicketCount/>
+            </div>
+        },
+        Some(false) => html! {
+            <div>
+                <crate::utilities::TicketCount/>
+            </div>
+        },
     }
 }
 
@@ -42,6 +50,7 @@ pub fn not_found_component() -> Html {
     html! {
         <div>
             <h1>{&message}</h1>
+            <Link<crate::Route> to={crate::Route::Home}>{ "Zurück zum Start" }</Link<crate::Route>>
         </div>
     }
 }
@@ -52,6 +61,7 @@ pub fn denied_component() -> Html {
         <div>
             <h1>{ "Sie haben nicht die benötigten Rechte um diese Seite aufzurufen" }</h1>
             <h3>{ "Wenn sie denken, dass dies ein Fehler ist kontaktieren sie Herrn Winter" }</h3>
+            <Link<crate::Route> to={crate::Route::Home}>{ "Zurück zum Start" }</Link<crate::Route>>
         </div>
     }
 }
diff --git a/frontend/src/pages/ticket.rs b/frontend/src/pages/ticket.rs
index c17f226..b1de16d 100644
--- a/frontend/src/pages/ticket.rs
+++ b/frontend/src/pages/ticket.rs
@@ -516,9 +516,9 @@ pub fn all_tickets_component() -> Html {
                             }}</p>
                         </li>
 
-                        <Link<crate::Route> to={crate::Route::Ticket}>{ "Zurück zur Startseite" }</Link<crate::Route>>
                     </div>
                 })}
+                <Link<crate::Route> to={crate::Route::Ticket}>{ "Zurück zur Startseite" }</Link<crate::Route>>
             </ul>
         }
     }