diff --git a/src/app.js b/src/app.js
index ed6608e..c84cf77 100644
--- a/src/app.js
+++ b/src/app.js
@@ -217,6 +217,9 @@ const TRANSLATIONS = {
     "events.team_drivers": "Lagförare",
     "events.team_cars": "Lagbilar",
     "events.team_hint": "Välj minst en förare eller bil per lag. Team Race-sessioner summerar lagets totala varv under hela körtiden, t.ex. 4 timmar.",
+    "events.team_steps": "1. Skriv lagnamn. 2. Kryssa förare och/eller bilar här under. 3. Klicka Lägg till lag. 4. Använd Redigera lag för ändringar efteråt.",
+    "events.team_form_drivers": "Markera lagförare innan du sparar laget.",
+    "events.team_form_cars": "Markera lagbilar innan du sparar laget.",
     "events.no_teams": "Inga lag skapade ännu.",
     "events.team_standings": "Lagställning",
     "events.no_team_results": "Inga teamresultat ännu.",
@@ -472,10 +475,11 @@ const TRANSLATIONS = {
     "guide.open_practice_3": "Open Practice påverkar inte seedning, kval eller finaler.",
     "guide.team_title": "Lagrace / Endurance",
     "guide.team_1": "Gå till Race Setup och skapa ett race i rätt klass.",
-    "guide.team_2": "Öppna Hantera och skapa lag under sektionen Lag.",
-    "guide.team_3": "Koppla förare och/eller bilar till varje lag. Minst en av dem krävs.",
-    "guide.team_4": "Skapa en session med typ Team Race och sätt tiden, t.ex. 240 minuter för 4 timmar.",
-    "guide.team_5": "Starta sessionen i Tidtagning. Alla passeringar från lagets medlemmar summeras till lagets totalvarv.",
+    "guide.team_2": "Öppna Hantera och gå till sektionen Lag.",
+    "guide.team_3": "Skriv lagnamn och kryssa förare och/eller bilar i samma teamblock innan du klickar Lägg till lag.",
+    "guide.team_4": "Efter att laget skapats kan du klicka Redigera lag för att ändra förare eller bilar.",
+    "guide.team_5": "Skapa en session med typ Team Race och sätt tiden, t.ex. 240 minuter för 4 timmar.",
+    "guide.team_6": "Starta sessionen i Tidtagning. Alla passeringar från lagets medlemmar summeras till lagets totalvarv.",
     "overlay.title": "Overlay",
     "overlay.subtitle": "Extern leaderboard-skärm",
     "overlay.no_active": "Ingen aktiv session vald.",
@@ -729,6 +733,9 @@ const TRANSLATIONS = {
     "events.team_drivers": "Team drivers",
     "events.team_cars": "Team cars",
     "events.team_hint": "Select at least one driver or car per team. Team Race sessions sum the team's total laps across the whole race duration, for example 4 hours.",
+    "events.team_steps": "1. Enter the team name. 2. Tick drivers and/or cars below. 3. Click Add team. 4. Use Edit team for later changes.",
+    "events.team_form_drivers": "Select team drivers before saving the team.",
+    "events.team_form_cars": "Select team cars before saving the team.",
     "events.no_teams": "No teams created yet.",
     "events.team_standings": "Team standings",
     "events.no_team_results": "No team results yet.",
@@ -984,10 +991,11 @@ const TRANSLATIONS = {
     "guide.open_practice_3": "Open Practice does not affect seeding, qualifying or finals.",
     "guide.team_title": "Team Race / Endurance",
     "guide.team_1": "Go to Race Setup and create a race in the correct class.",
-    "guide.team_2": "Open Manage and create teams in the Teams section.",
-    "guide.team_3": "Assign drivers and/or cars to each team. At least one is required.",
-    "guide.team_4": "Create a session with type Team Race and set the time, for example 240 minutes for 4 hours.",
-    "guide.team_5": "Start the session in Timing. All passings from the team's members are added to the team's total laps.",
+    "guide.team_2": "Open Manage and go to the Teams section.",
+    "guide.team_3": "Enter the team name and tick drivers and/or cars in the same team block before you click Add team.",
+    "guide.team_4": "After the team is created, click Edit team to change drivers or cars.",
+    "guide.team_5": "Create a session with type Team Race and set the time, for example 240 minutes for 4 hours.",
+    "guide.team_6": "Start the session in Timing. All passings from the team's members are added to the team's total laps.",
     "overlay.title": "Overlay",
     "overlay.subtitle": "External leaderboard screen",
     "overlay.no_active": "No active session selected.",
@@ -2958,7 +2966,8 @@ function renderEventManager(eventId) {
         <div class="panel-header"><h3>${t("events.teams")}</h3></div>
         <div class="panel-body">
           <p class="hint">${t("events.team_race_intro")}</p>
-          <form id="teamForm" class="form-grid cols-4">
+          <p class="hint">${t("events.team_steps")}</p>
+          <form id="teamForm" class="form-grid cols-4 team-create-form">
             <input name="teamName" required placeholder="${t("events.team_name")}" />
             <button class="btn btn-primary" type="submit">${t("events.add_team")}</button>
           </form>
@@ -2966,6 +2975,7 @@ function renderEventManager(eventId) {
           <div class="panel-row mt-16">
             <section class="panel">
               <div class="panel-header"><h3>${t("events.team_drivers")}</h3></div>
+              <div class="panel-body"><p class="hint">${t("events.team_form_drivers")}</p></div>
               <div class="panel-body check-grid">
                 ${raceDrivers
                   .map(
@@ -2981,6 +2991,7 @@ function renderEventManager(eventId) {
             </section>
             <section class="panel">
               <div class="panel-header"><h3>${t("events.team_cars")}</h3></div>
+              <div class="panel-body"><p class="hint">${t("events.team_form_cars")}</p></div>
               <div class="panel-body check-grid">
                 ${state.cars
                   .map(
@@ -3571,7 +3582,9 @@ function renderEventManager(eventId) {
       if (!name || (!driverIds.length && !carIds.length)) {
         return;
       }
-      event.raceConfig.teams = [...getEventTeams(event), normalizeRaceTeam({ id: uid("team"), name, driverIds, carIds })];
+      const createdTeam = normalizeRaceTeam({ id: uid("team"), name, driverIds, carIds });
+      event.raceConfig.teams = [...getEventTeams(event), createdTeam];
+      selectedTeamEditId = createdTeam.id;
       saveState();
       renderEventManager(eventId);
     });
@@ -4301,6 +4314,7 @@ function renderGuide() {
           <li>${t("guide.team_3")}</li>
           <li>${t("guide.team_4")}</li>
           <li>${t("guide.team_5")}</li>
+          <li>${t("guide.team_6")}</li>
         </ul>
       </div>
     </section>
diff --git a/src/styles.css b/src/styles.css
index e573de6..5e889db 100644
--- a/src/styles.css
+++ b/src/styles.css
@@ -591,6 +591,10 @@ select:focus {
   background: rgba(255, 255, 255, 0.03);
 }
 
+.team-create-form {
+  align-items: center;
+}
+
 .team-card {
   display: flex;
   justify-content: space-between;