diff --git a/application/src/components/participants.rs b/application/src/components/participants.rs
index 3a60081..7a006bf 100644
--- a/application/src/components/participants.rs
+++ b/application/src/components/participants.rs
@@ -22,14 +22,14 @@ pub fn Participants(
                 <Show when=move || show_group>
                     <th>"Groep"</th>
                 </Show>
-                <Show when=move || show_lifesaver>
-                    <th>"Lifesaver"</th>
+                <Show when=move || show_popduiken>
+                    <th>"Popduiken"</th>
                 </Show>
                 <Show when=move || show_hindernis>
                     <th>"Hindernis"</th>
                 </Show>
-                <Show when=move || show_popduiken>
-                    <th>"Popduiken"</th>
+                <Show when=move || show_lifesaver>
+                    <th>"Lifesaver"</th>
                 </Show>
             </tr>
             <For
@@ -44,20 +44,26 @@ pub fn Participants(
                     </Show>
                     { move || match child.value.get().events {
                             Some(events) => view! {
-                                <Show when=move || show_lifesaver>
-                                    <td>{ Time::from_milliseconds_to_string(events.lifesaver.unwrap_or(0)) }</td>
+                                <Show when=move || show_popduiken>
+                                    <td>{ Time::from_milliseconds_to_string(events.popduiken.unwrap_or(0)) }</td>
                                 </Show>
                                 <Show when=move || show_hindernis>
                                     <td>{ Time::from_milliseconds_to_string(events.hindernis.unwrap_or(0)) }</td>
                                 </Show>
-                                <Show when=move || show_popduiken>
-                                    <td>{ Time::from_milliseconds_to_string(events.popduiken.unwrap_or(0)) }</td>
+                                <Show when=move || show_lifesaver>
+                                    <td>{ Time::from_milliseconds_to_string(events.lifesaver.unwrap_or(0)) }</td>
                                 </Show>
                             },
                             None => view! {
-                                <td>"0"</td>
-                                <td>"0"</td>
-                                <td>"0"</td>
+                                <Show when=move || show_popduiken>
+                                    <td>"0"</td>
+                                </Show>
+                                <Show when=move || show_hindernis>
+                                    <td>"0"</td>
+                                </Show>
+                                <Show when=move || show_lifesaver>
+                                    <td>"0"</td>
+                                </Show>
                             }
                         }
                     }
diff --git a/application/src/pages/groups.rs b/application/src/pages/groups.rs
index 767ac3e..7d77089 100644
--- a/application/src/pages/groups.rs
+++ b/application/src/pages/groups.rs
@@ -78,16 +78,16 @@ pub fn Groups() -> impl IntoView {
         <components::participants::Participants participants=total_score_participants.into() show_group=false />
         <div class="events-container">
             <div>
-                <h3>"Lifesaver"</h3>
-                <components::participants::Participants participants=participants_lifesaver.into() show_group=false show_popduiken=false show_hindernis=false />
+                <h3>"Popduiken"</h3>
+                <components::participants::Participants participants=participants_popduiken.into() show_group=false show_hindernis=false show_lifesaver=false />
             </div>
             <div>
                 <h3>"Hindernis"</h3>
                 <components::participants::Participants participants=participants_hindernis.into() show_group=false show_popduiken=false show_lifesaver=false />
             </div>
             <div>
-                <h3>"Popduiken"</h3>
-                <components::participants::Participants participants=participants_popduiken.into() show_group=false show_hindernis=false show_lifesaver=false />
+                <h3>"Lifesaver"</h3>
+                <components::participants::Participants participants=participants_lifesaver.into() show_group=false show_popduiken=false show_hindernis=false />
             </div>
         </div>
     }