diff --git a/internal/db/migrate/migrate.go b/internal/db/migrate/migrate.go
index 4393e3d..c6c1aa7 100644
--- a/internal/db/migrate/migrate.go
+++ b/internal/db/migrate/migrate.go
@@ -498,13 +498,22 @@ func ResetDatabase(ctx context.Context, cfg *config.Config) error {
 	conn := db.NewDB(cfg.DB)
 	defer func() { _ = conn.Close() }()
 
-	models := conn.RegisterModels()
+	conn.RegisterModels()
 
-	for _, model := range models {
-		if err := conn.ResetModel(ctx, model); err != nil {
-			return errors.Wrap(err, "reset model")
-		}
+	err = RunMigrations(ctx, cfg, "rollback", "all")
+	if err != nil {
+		return errors.Wrap(err, "RunMigrations: rollback")
 	}
+	err = RunMigrations(ctx, cfg, "up", "all")
+	if err != nil {
+		return errors.Wrap(err, "RunMigrations: up")
+	}
+
+	// for _, model := range models {
+	// 	if err := conn.ResetModel(ctx, model); err != nil {
+	// 		return errors.Wrap(err, "reset model")
+	// 	}
+	// }
 
 	fmt.Println("✅ Database reset complete")
 	return nil
diff --git a/internal/db/migrations/20260210182212_add_leagues.go b/internal/db/migrations/20260210182212_add_leagues.go
index 53599d8..bf2de8b 100644
--- a/internal/db/migrations/20260210182212_add_leagues.go
+++ b/internal/db/migrations/20260210182212_add_leagues.go
@@ -55,13 +55,7 @@ func init() {
 			if err != nil {
 				return err
 			}
-
-			// Remove slap_version column from seasons table
-			_, err = conn.NewDropColumn().
-				Model((*db.Season)(nil)).
-				ColumnExpr("slap_version").
-				Exec(ctx)
-			return err
+			return nil
 		},
 	)
 }
diff --git a/internal/db/migrations/20260218185128_add_type_to_seasons.go b/internal/db/migrations/20260218185128_add_type_to_seasons.go
new file mode 100644
index 0000000..c396c29
--- /dev/null
+++ b/internal/db/migrations/20260218185128_add_type_to_seasons.go
@@ -0,0 +1,63 @@
+package migrations
+
+import (
+	"context"
+
+	"git.haelnorr.com/h/oslstats/internal/db"
+	"github.com/uptrace/bun"
+)
+
+func init() {
+	Migrations.MustRegister(
+		// UP migration
+		func(ctx context.Context, conn *bun.DB) error {
+			// Add your migration code here
+			_, err := conn.NewAddColumn().
+				Model((*db.Season)(nil)).
+				IfNotExists().
+				ColumnExpr("type VARCHAR NOT NULL").
+				Exec(ctx)
+			if err != nil {
+				return err
+			}
+
+			leagues := []db.League{
+				{
+					Name:        "Pro League",
+					ShortName:   "Pro",
+					Description: "For the most experienced Slapshotters in OSL",
+				},
+				{
+					Name:        "Intermediate League",
+					ShortName:   "IM",
+					Description: "For returning players who've been practicing in RPUGs and PUBs",
+				},
+				{
+					Name:        "Open League",
+					ShortName:   "Open",
+					Description: "For new players just getting started with Slapshot",
+				},
+				{
+					Name:        "Draft League",
+					ShortName:   "Draft",
+					Description: "A league where teams are selected by a draft system",
+				},
+			}
+			for _, league := range leagues {
+				_, err = conn.NewInsert().
+					Model(&league).
+					On("CONFLICT DO NOTHING").
+					Exec(ctx)
+				if err != nil {
+					return err
+				}
+			}
+			return nil
+		},
+		// DOWN migration
+		func(ctx context.Context, conn *bun.DB) error {
+			// Add your rollback code here
+			return nil
+		},
+	)
+}
diff --git a/internal/db/season.go b/internal/db/season.go
index ec3c572..612e170 100644
--- a/internal/db/season.go
+++ b/internal/db/season.go
@@ -25,6 +25,17 @@ const (
 	StatusCompleted SeasonStatus = "completed"
 )
 
+type SeasonType string
+
+func (s SeasonType) String() string {
+	return string(s)
+}
+
+const (
+	SeasonTypeRegular SeasonType = "regular"
+	SeasonTypeDraft   SeasonType = "draft"
+)
+
 type Season struct {
 	bun.BaseModel `bun:"table:seasons,alias:s"`
 
@@ -36,13 +47,14 @@ type Season struct {
 	FinalsStartDate bun.NullTime `bun:"finals_start_date" json:"finals_start_date"`
 	FinalsEndDate   bun.NullTime `bun:"finals_end_date" json:"finals_end_date"`
 	SlapVersion     string       `bun:"slap_version,notnull,default:'rebound'" json:"slap_version"`
+	Type            string       `bun:"type,notnull" json:"type"`
 
 	Leagues []League `bun:"m2m:season_leagues,join:Season=League" json:"-"`
 	Teams   []Team   `bun:"m2m:team_participations,join:Season=Team" json:"-"`
 }
 
 // NewSeason creats a new season
-func NewSeason(ctx context.Context, tx bun.Tx, name, version, shortname string,
+func NewSeason(ctx context.Context, tx bun.Tx, name, version, shortname, type_ string,
 	start time.Time, audit *AuditMeta,
 ) (*Season, error) {
 	season := &Season{
@@ -50,12 +62,19 @@ func NewSeason(ctx context.Context, tx bun.Tx, name, version, shortname string,
 		ShortName:   strings.ToUpper(shortname),
 		StartDate:   start.Truncate(time.Hour * 24),
 		SlapVersion: version,
+		Type:        type_,
 	}
 	err := Insert(tx, season).
 		WithAudit(audit, nil).Exec(ctx)
 	if err != nil {
 		return nil, errors.WithMessage(err, "db.Insert")
 	}
+	if season.Type == SeasonTypeDraft.String() {
+		err = NewSeasonLeague(ctx, tx, season.ShortName, "Draft", audit)
+		if err != nil {
+			return nil, errors.Wrap(err, "NewSeasonLeague")
+		}
+	}
 	return season, nil
 }
 
diff --git a/internal/embedfs/web/css/output.css b/internal/embedfs/web/css/output.css
index 15ea92e..de0cd50 100644
--- a/internal/embedfs/web/css/output.css
+++ b/internal/embedfs/web/css/output.css
@@ -9,7 +9,6 @@
     --font-mono: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, 'Liberation Mono', 'Courier New',
     monospace;
     --spacing: 0.25rem;
-    --breakpoint-lg: 64rem;
     --breakpoint-xl: 80rem;
     --breakpoint-2xl: 96rem;
     --container-sm: 24rem;
@@ -284,6 +283,12 @@
   .z-50 {
     z-index: 50;
   }
+  .col-span-1 {
+    grid-column: span 1 / span 1;
+  }
+  .col-span-2 {
+    grid-column: span 2 / span 2;
+  }
   .container {
     width: 100%;
     @media (width >= 40rem) {
@@ -308,6 +313,9 @@
   .-mt-2 {
     margin-top: calc(var(--spacing) * -2);
   }
+  .-mt-3 {
+    margin-top: calc(var(--spacing) * -3);
+  }
   .mt-0\.5 {
     margin-top: calc(var(--spacing) * 0.5);
   }
@@ -525,15 +533,15 @@
   .max-w-100 {
     max-width: calc(var(--spacing) * 100);
   }
+  .max-w-lg {
+    max-width: var(--container-lg);
+  }
   .max-w-md {
     max-width: var(--container-md);
   }
   .max-w-screen-2xl {
     max-width: var(--breakpoint-2xl);
   }
-  .max-w-screen-lg {
-    max-width: var(--breakpoint-lg);
-  }
   .max-w-screen-xl {
     max-width: var(--breakpoint-xl);
   }
@@ -597,12 +605,18 @@
   .resize-none {
     resize: none;
   }
+  .appearance-none {
+    appearance: none;
+  }
   .grid-cols-1 {
     grid-template-columns: repeat(1, minmax(0, 1fr));
   }
   .grid-cols-2 {
     grid-template-columns: repeat(2, minmax(0, 1fr));
   }
+  .grid-cols-3 {
+    grid-template-columns: repeat(3, minmax(0, 1fr));
+  }
   .grid-cols-7 {
     grid-template-columns: repeat(7, minmax(0, 1fr));
   }
@@ -618,6 +632,9 @@
   .items-center {
     align-items: center;
   }
+  .items-end {
+    align-items: flex-end;
+  }
   .items-start {
     align-items: flex-start;
   }
@@ -819,6 +836,9 @@
       border-color: color-mix(in oklab, var(--red) 30%, transparent);
     }
   }
+  .border-surface0 {
+    border-color: var(--surface0);
+  }
   .border-surface1 {
     border-color: var(--surface1);
   }
@@ -1171,6 +1191,11 @@
   .italic {
     font-style: italic;
   }
+  .placeholder-subtext0 {
+    &::placeholder {
+      color: var(--subtext0);
+    }
+  }
   .opacity-0 {
     opacity: 0%;
   }
@@ -1184,6 +1209,10 @@
     --tw-shadow: 0 10px 15px -3px var(--tw-shadow-color, rgb(0 0 0 / 0.1)), 0 4px 6px -4px var(--tw-shadow-color, rgb(0 0 0 / 0.1));
     box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
   }
+  .shadow-md {
+    --tw-shadow: 0 4px 6px -1px var(--tw-shadow-color, rgb(0 0 0 / 0.1)), 0 2px 4px -2px var(--tw-shadow-color, rgb(0 0 0 / 0.1));
+    box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
+  }
   .shadow-sm {
     --tw-shadow: 0 1px 3px 0 var(--tw-shadow-color, rgb(0 0 0 / 0.1)), 0 1px 2px -1px var(--tw-shadow-color, rgb(0 0 0 / 0.1));
     box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
@@ -1247,6 +1276,14 @@
     -webkit-user-select: none;
     user-select: none;
   }
+  .hover\:-translate-y-0\.5 {
+    &:hover {
+      @media (hover: hover) {
+        --tw-translate-y: calc(var(--spacing) * -0.5);
+        translate: var(--tw-translate-x) var(--tw-translate-y);
+      }
+    }
+  }
   .hover\:cursor-pointer {
     &:hover {
       @media (hover: hover) {
@@ -1492,6 +1529,14 @@
       }
     }
   }
+  .hover\:shadow-lg {
+    &:hover {
+      @media (hover: hover) {
+        --tw-shadow: 0 10px 15px -3px var(--tw-shadow-color, rgb(0 0 0 / 0.1)), 0 4px 6px -4px var(--tw-shadow-color, rgb(0 0 0 / 0.1));
+        box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
+      }
+    }
+  }
   .focus\:border-blue {
     &:focus {
       border-color: var(--blue);
@@ -1578,6 +1623,12 @@
       opacity: 50%;
     }
   }
+  .disabled\:shadow-none {
+    &:disabled {
+      --tw-shadow: 0 0 #0000;
+      box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
+    }
+  }
   .sm\:end-6 {
     @media (width >= 40rem) {
       inset-inline-end: calc(var(--spacing) * 6);
diff --git a/internal/handlers/seasons_new.go b/internal/handlers/seasons_new.go
index dee53ab..f5a3769 100644
--- a/internal/handlers/seasons_new.go
+++ b/internal/handlers/seasons_new.go
@@ -16,11 +16,13 @@ import (
 	"github.com/uptrace/bun"
 )
 
+// NewSeason handles GET requests - redirects to the seasons list
+// The form is now in a modal on the list page
 func NewSeason(
 	s *hws.Server,
 ) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		renderSafely(seasonsview.NewPage(), s, r, w)
+		respond.HXRedirect(w, "/seasons")
 	})
 }
 
@@ -41,6 +43,8 @@ func NewSeasonSubmit(
 			MaxLength(6).MinLength(2).Value
 		version := getter.String("slap_version").
 			TrimSpace().Required().AllowedValues([]string{"rebound", "slapshot1"}).Value
+		type_ := getter.String("type").
+			TrimSpace().Required().AllowedValues([]string{"regular", "draft"}).Value
 		format := timefmt.NewBuilder().
 			DayNumeric2().Slash().
 			MonthNumeric2().Slash().
@@ -52,7 +56,6 @@ func NewSeasonSubmit(
 
 		nameUnique := false
 		shortNameUnique := false
-		var season *db.Season
 		if ok := conn.WithNotifyTx(s, w, r, func(ctx context.Context, tx bun.Tx) (bool, error) {
 			var err error
 			nameUnique, err = db.IsUnique(ctx, tx, (*db.Season)(nil), "name", name)
@@ -66,7 +69,7 @@ func NewSeasonSubmit(
 			if !nameUnique || !shortNameUnique {
 				return true, nil
 			}
-			season, err = db.NewSeason(ctx, tx, name, version, shortname, start, db.NewAuditFromRequest(r))
+			_, err = db.NewSeason(ctx, tx, name, version, shortname, type_, start, db.NewAuditFromRequest(r))
 			if err != nil {
 				return false, errors.Wrap(err, "db.NewSeason")
 			}
@@ -84,7 +87,26 @@ func NewSeasonSubmit(
 			notify.Warn(s, w, r, "Duplicate Short Name", "This short name is already taken.", nil)
 			return
 		}
-		respond.HXRedirect(w, "/seasons/%s", season.ShortName)
-		notify.SuccessWithDelay(s, w, r, "Season Created", fmt.Sprintf("Successfully created season: %s", name), nil)
+
+		// Return the updated seasons list
+		pageOpts := &db.PageOpts{
+			Page:    1,
+			PerPage: 10,
+			Order:   bun.OrderDesc,
+			OrderBy: "start_date",
+		}
+		var seasons *db.List[db.Season]
+		if ok := conn.WithReadTx(s, w, r, func(ctx context.Context, tx bun.Tx) (bool, error) {
+			var err error
+			seasons, err = db.ListSeasons(ctx, tx, pageOpts)
+			if err != nil {
+				return false, errors.Wrap(err, "db.ListSeasons")
+			}
+			return true, nil
+		}); !ok {
+			return
+		}
+		renderSafely(seasonsview.SeasonsList(seasons), s, r, w)
+		notify.Success(s, w, r, "Season Created", fmt.Sprintf("Successfully created season: %s", name), nil)
 	})
 }
diff --git a/internal/view/seasonsview/detail_page.templ b/internal/view/seasonsview/detail_page.templ
index 3739a23..cdc2791 100644
--- a/internal/view/seasonsview/detail_page.templ
+++ b/internal/view/seasonsview/detail_page.templ
@@ -25,11 +25,12 @@ templ SeasonDetails(season *db.Season, leaguesWithTeams []db.LeagueWithTeams) {
 		<div class="bg-surface0 border-b border-surface1 px-6 py-8">
 			<div class="flex flex-col sm:flex-row justify-between items-start sm:items-center gap-4">
 				<div>
-					<h1 class="text-4xl font-bold text-text mb-2">{ season.Name }</h1>
+					<div class="flex items-center gap-3 mb-2">
+						<h1 class="text-4xl font-bold text-text">{ season.Name }</h1>
+						<span class="text-lg font-mono text-subtext0 bg-surface1 px-2 py-0.5 rounded">{ season.ShortName }</span>
+					</div>
 					<div class="flex items-center gap-2 flex-wrap">
-						<span class="inline-block bg-blue px-3 py-1 rounded-full text-sm font-semibold text-mantle">
-							{ season.ShortName }
-						</span>
+						@SeasonTypeBadge(season.Type)
 						@SlapVersionBadge(season.SlapVersion)
 						@StatusBadge(season, false, false)
 					</div>
@@ -221,3 +222,16 @@ templ SlapVersionBadge(version string) {
 			</span>
 	}
 }
+
+templ SeasonTypeBadge(type_ string) {
+	switch type_ {
+		case "regular":
+			<span class="inline-block bg-sapphire px-3 py-1 rounded-full text-sm font-semibold text-mantle">
+				Regular
+			</span>
+		case "draft":
+			<span class="inline-block bg-mauve px-3 py-1 rounded-full text-sm font-semibold text-mantle">
+				Draft
+			</span>
+	}
+}
diff --git a/internal/view/seasonsview/list_page.templ b/internal/view/seasonsview/list_page.templ
index 5623e67..bff68bb 100644
--- a/internal/view/seasonsview/list_page.templ
+++ b/internal/view/seasonsview/list_page.templ
@@ -12,8 +12,14 @@ import "git.haelnorr.com/h/oslstats/internal/permissions"
 
 templ ListPage(seasons *db.List[db.Season]) {
 	@baseview.Layout("Seasons") {
+		<!-- Flatpickr CSS -->
+		<link rel="stylesheet" href="/static/vendored/flatpickr@4.6.13.min.css"/>
+		<link rel="stylesheet" href="/static/css/flatpickr-catppuccin.css"/>
+		<!-- Flatpickr JS -->
+		<script src="/static/vendored/flatpickr@4.6.13.min.js"></script>
 		<div class="max-w-screen-2xl mx-auto px-2">
 			@SeasonsList(seasons)
+			@NewSeasonModal()
 		</div>
 	}
 }
@@ -63,13 +69,14 @@ templ SeasonsList(seasons *db.List[db.Season]) {
 			<div class="flex flex-col sm:flex-row justify-between items-start sm:items-center gap-4 mb-6 px-4">
 				<div class="flex gap-4 items-center">
 					<span class="text-3xl font-bold">Seasons</span>
-					if canAddSeason {
-						<a
-							href="/seasons/new"
-							class="rounded-lg px-2 py-1 hover:cursor-pointer text-center text-sm
+				if canAddSeason {
+					<button
+						type="button"
+						@click="$dispatch('open-new-season-modal')"
+						class="rounded-lg px-2 py-1 hover:cursor-pointer text-center text-sm
               bg-green hover:bg-green/75 text-mantle transition"
-						>Add season</a>
-					}
+					>Add season</button>
+				}
 				</div>
 				@sort.Dropdown(seasons.PageOpts, sortOpts)
 			</div>
diff --git a/internal/view/seasonsview/new_form.templ b/internal/view/seasonsview/new_form.templ
deleted file mode 100644
index 1ccb678..0000000
--- a/internal/view/seasonsview/new_form.templ
+++ /dev/null
@@ -1,196 +0,0 @@
-package seasonsview
-
-import "git.haelnorr.com/h/oslstats/internal/view/datepicker"
-
-templ NewForm() {
-	<form
-		hx-post="/seasons/new"
-		hx-swap="none"
-		x-data={ templ.JSFuncCall("newSeasonFormData").CallInline }
-		@submit="handleSubmit()"
-		@htmx:after-request="if(submitTimeout) clearTimeout(submitTimeout); const redirect = $event.detail.xhr.getResponseHeader('HX-Redirect'); if(redirect) return; if(!$event.detail.successful && $event.detail.xhr.status !== 409) { isSubmitting=false; buttonText='Create Season'; generalError='An error occurred. Please try again.'; }"
-	>
-		<script>
-			function newSeasonFormData() {
-				return {
-					canSubmit: false,
-					buttonText: "Create Season",
-					// Name validation state
-					nameError: "",
-					nameIsChecking: false,
-					nameIsUnique: false,
-					nameIsEmpty: true,
-					// Short name validation state
-					shortNameError: "",
-					shortNameIsChecking: false,
-					shortNameIsUnique: false,
-					shortNameIsEmpty: true,
-					// Date validation state
-					dateError: "",
-					dateIsEmpty: true,
-					// Form state
-					isSubmitting: false,
-					generalError: "",
-					submitTimeout: null,
-					// Reset name errors
-					resetNameErr() {
-						this.nameError = "";
-						this.nameIsChecking = false;
-						this.nameIsUnique = false;
-					},
-					// Reset short name errors
-					resetShortNameErr() {
-						this.shortNameError = "";
-						this.shortNameIsChecking = false;
-						this.shortNameIsUnique = false;
-					},
-					// Reset date errors
-					resetDateErr() {
-						this.dateError = "";
-					},
-					// Check if form can be submitted
-					updateCanSubmit() {
-						this.canSubmit =
-							!this.nameIsEmpty &&
-							this.nameIsUnique &&
-							!this.nameIsChecking &&
-							!this.shortNameIsEmpty &&
-							this.shortNameIsUnique &&
-							!this.shortNameIsChecking &&
-							!this.dateIsEmpty;
-					},
-					// Handle form submission
-					handleSubmit() {
-						this.isSubmitting = true;
-						this.buttonText = "Creating...";
-						this.generalError = "";
-						// Set timeout for 10 seconds
-						this.submitTimeout = setTimeout(() => {
-							this.isSubmitting = false;
-							this.buttonText = "Create Season";
-							this.generalError = "Request timed out. Please try again.";
-						}, 10000);
-					},
-				};
-			}
-		</script>
-		<div class="grid gap-y-5">
-			<!-- Name Field -->
-			<div>
-				<label for="name" class="block text-sm font-medium mb-2">Season Name</label>
-				<div class="relative">
-					<input
-						type="text"
-						id="name"
-						name="name"
-						maxlength="20"
-						x-bind:class="{
-							'py-3 px-4 block w-full rounded-lg text-sm bg-base disabled:opacity-50 disabled:pointer-events-none border-2 outline-none': true,
-							'border-overlay0 focus:border-blue': !nameIsUnique && !nameError,
-							'border-green focus:border-green': nameIsUnique && !nameIsChecking && !nameError,
-							'border-red focus:border-red': nameError && !nameIsChecking && !isSubmitting
-						}"
-						required
-						placeholder="e.g. Season 1"
-						@input="resetNameErr(); nameIsEmpty = $el.value.trim() === ''; if(nameIsEmpty) { nameError='Season name is required'; nameIsUnique=false; } updateCanSubmit();"
-						hx-post="/htmx/isseasonnameunique"
-						hx-trigger="input changed delay:500ms"
-						hx-swap="none"
-						@htmx:before-request="if($el.value.trim() === '') { nameIsEmpty=true; return; } nameIsEmpty=false; nameIsChecking=true; nameIsUnique=false; nameError=''; updateCanSubmit();"
-						@htmx:after-request="nameIsChecking=false; if($event.detail.successful) { nameIsUnique=true; } else if($event.detail.xhr.status === 409) { nameError='This season name is already taken'; nameIsUnique=false; } updateCanSubmit();"
-					/>
-					<p class="text-xs text-subtext1 mt-1">Maximum 20 characters</p>
-				</div>
-				<p
-					class="text-center text-xs text-red mt-2"
-					x-show="nameError && !isSubmitting"
-					x-cloak
-					x-text="nameError"
-				></p>
-			</div>
-			<!-- Short Name Field -->
-			<div>
-				<label for="short_name" class="block text-sm font-medium mb-2">Short Name</label>
-				<div class="relative">
-					<input
-						type="text"
-						id="short_name"
-						name="short_name"
-						maxlength="6"
-						x-bind:class="{
-							'py-3 px-4 block w-full rounded-lg text-sm bg-base disabled:opacity-50 disabled:pointer-events-none border-2 outline-none uppercase': true,
-							'border-overlay0 focus:border-blue': !shortNameIsUnique && !shortNameError,
-							'border-green focus:border-green': shortNameIsUnique && !shortNameIsChecking && !shortNameError,
-							'border-red focus:border-red': shortNameError && !shortNameIsChecking && !isSubmitting
-						}"
-						required
-						placeholder="e.g. S1"
-						pattern="[A-Z0-9]+"
-						@input="
-							let val = $el.value.toUpperCase().replace(/[^A-Z0-9]/g, '');
-							$el.value = val;
-							resetShortNameErr();
-							shortNameIsEmpty = val.trim() === '';
-							if(shortNameIsEmpty) {
-								shortNameError='Short name is required';
-								shortNameIsUnique=false;
-							}
-							updateCanSubmit();
-						"
-						hx-post="/htmx/isseasonshortnameunique"
-						hx-trigger="input changed delay:500ms"
-						hx-swap="none"
-						@htmx:before-request="if($el.value.trim() === '') { shortNameIsEmpty=true; return; } shortNameIsEmpty=false; shortNameIsChecking=true; shortNameIsUnique=false; shortNameError=''; updateCanSubmit();"
-						@htmx:after-request="shortNameIsChecking=false; if($event.detail.successful) { shortNameIsUnique=true; } else if($event.detail.xhr.status === 409) { shortNameError='This short name is already taken'; shortNameIsUnique=false; } updateCanSubmit();"
-					/>
-					<p class="text-xs text-subtext1 mt-1">Maximum 6 characters, alphanumeric only (auto-capitalized)</p>
-				</div>
-				<p
-					class="text-center text-xs text-red mt-2"
-					x-show="shortNameError && !isSubmitting"
-					x-cloak
-					x-text="shortNameError"
-				></p>
-			</div>
-			<!-- Slap Version Field -->
-			<div>
-				<label for="slap_version" class="block text-sm font-medium mb-2">Slap Version</label>
-				<select
-					id="slap_version"
-					name="slap_version"
-					class="py-3 px-4 block w-full rounded-lg text-sm bg-base border-2 border-overlay0 focus:border-blue outline-none"
-					required
-				>
-					<option value="rebound" selected>Rebound</option>
-					<option value="slapshot1">Slapshot 1</option>
-				</select>
-				<p class="text-xs text-subtext1 mt-1">Select the game version for this season</p>
-			</div>
-			<!-- Start Date Field -->
-			@datepicker.DatePicker("start_date", "start_date", "Start Date", "DD/MM/YYYY", true, "dateIsEmpty = $el.value === ''; resetDateErr(); if(dateIsEmpty) { dateError='Start date is required'; } updateCanSubmit();")
-			<p
-				class="text-center text-xs text-red mt-2"
-				x-show="dateError && !isSubmitting"
-				x-cloak
-				x-text="dateError"
-			></p>
-			<!-- General Error Message -->
-			<p
-				class="text-center text-sm text-red"
-				x-show="generalError"
-				x-cloak
-				x-text="generalError"
-			></p>
-			<!-- Submit Button -->
-			<button
-				x-bind:disabled="!canSubmit || isSubmitting"
-				x-text="buttonText"
-				type="submit"
-				class="w-full py-3 px-4 inline-flex justify-center items-center 
-                    gap-x-2 rounded-lg border border-transparent transition font-semibold
-                    bg-blue hover:bg-blue/75 text-mantle hover:cursor-pointer
-                    disabled:bg-blue/40 disabled:cursor-not-allowed"
-			></button>
-		</div>
-	</form>
-}
diff --git a/internal/view/seasonsview/new_form_modal.templ b/internal/view/seasonsview/new_form_modal.templ
new file mode 100644
index 0000000..587793b
--- /dev/null
+++ b/internal/view/seasonsview/new_form_modal.templ
@@ -0,0 +1,275 @@
+package seasonsview
+
+// NewFormModal is a version of the form for use in a modal
+// It closes the modal and refreshes the list on success instead of redirecting
+templ NewFormModal() {
+	<form
+		hx-post="/seasons/new"
+		hx-target="#seasons-list-container"
+		hx-swap="outerHTML"
+		x-data={ templ.JSFuncCall("newSeasonFormModalData").CallInline }
+		@submit="handleSubmit()"
+		@htmx:after-request="
+			if(submitTimeout) clearTimeout(submitTimeout);
+			// Only handle the form submission (not uniqueness checks)
+			const path = $event.detail.requestConfig.path;
+			if(path !== '/seasons/new') return;
+			if($event.detail.successful) {
+				// Close the modal
+				$dispatch('close-new-season-modal');
+				// Reset form
+				$el.reset();
+				isSubmitting=false;
+				buttonText='Create Season';
+				// Reset validation state
+				nameIsEmpty=true;
+				nameIsUnique=false;
+				shortNameIsEmpty=true;
+				shortNameIsUnique=false;
+				dateIsEmpty=true;
+				updateCanSubmit();
+				// Clear flatpickr
+				const fpInput = document.getElementById('start_date');
+				if(fpInput && fpInput._flatpickr) {
+					fpInput._flatpickr.clear();
+				}
+			} else if($event.detail.xhr.status !== 409) {
+				isSubmitting=false;
+				buttonText='Create Season';
+				generalError='An error occurred. Please try again.';
+			}
+		"
+		x-init="initFlatpickrModal()"
+	>
+		<script>
+			function newSeasonFormModalData() {
+				return {
+					canSubmit: false,
+					buttonText: "Create Season",
+					// Name validation state
+					nameError: "",
+					nameIsChecking: false,
+					nameIsUnique: false,
+					nameIsEmpty: true,
+					// Short name validation state
+					shortNameError: "",
+					shortNameIsChecking: false,
+					shortNameIsUnique: false,
+					shortNameIsEmpty: true,
+					// Date validation state
+					dateError: "",
+					dateIsEmpty: true,
+					// Form state
+					isSubmitting: false,
+					generalError: "",
+					submitTimeout: null,
+					// Reset name errors
+					resetNameErr() {
+						this.nameError = "";
+						this.nameIsChecking = false;
+						this.nameIsUnique = false;
+					},
+					// Reset short name errors
+					resetShortNameErr() {
+						this.shortNameError = "";
+						this.shortNameIsChecking = false;
+						this.shortNameIsUnique = false;
+					},
+					// Reset date errors
+					resetDateErr() {
+						this.dateError = "";
+					},
+					// Check if form can be submitted
+					updateCanSubmit() {
+						this.canSubmit =
+							!this.nameIsEmpty &&
+							this.nameIsUnique &&
+							!this.nameIsChecking &&
+							!this.shortNameIsEmpty &&
+							this.shortNameIsUnique &&
+							!this.shortNameIsChecking &&
+							!this.dateIsEmpty;
+					},
+					// Handle form submission
+					handleSubmit() {
+						this.isSubmitting = true;
+						this.buttonText = "Creating...";
+						this.generalError = "";
+						// Set timeout for 10 seconds
+						this.submitTimeout = setTimeout(() => {
+							this.isSubmitting = false;
+							this.buttonText = "Create Season";
+							this.generalError = "Request timed out. Please try again.";
+						}, 10000);
+					},
+				};
+			}
+			function initFlatpickrModal() {
+				// Small delay to ensure DOM is ready after modal opens
+				setTimeout(() => {
+					if (typeof flatpickr !== 'undefined') {
+						flatpickr('#start_date', {
+							dateFormat: 'd/m/Y',
+							allowInput: true,
+							onChange: function(selectedDates, dateStr) {
+								const input = document.getElementById('start_date');
+								input.value = dateStr;
+								input.dispatchEvent(new Event('input', { bubbles: true }));
+							}
+						});
+					}
+				}, 100);
+			}
+		</script>
+		<div class="grid gap-y-5">
+			<!-- Name and Short Name Fields (Inlined) -->
+			<div class="grid grid-cols-3 gap-4">
+				<!-- Name Field -->
+				<div class="col-span-2">
+					<label for="name" class="block text-sm font-medium mb-2 text-subtext0">Season Name</label>
+					<div class="relative">
+						<input
+							type="text"
+							id="name"
+							name="name"
+							maxlength="20"
+							x-bind:class="{
+								'py-3 px-4 block w-full rounded-lg text-sm bg-surface0 disabled:opacity-50 disabled:pointer-events-none border-2 outline-none text-text placeholder-subtext0': true,
+								'border-surface1 focus:border-blue': !nameIsUnique && !nameError,
+								'border-green focus:border-green': nameIsUnique && !nameIsChecking && !nameError,
+								'border-red focus:border-red': nameError && !nameIsChecking && !isSubmitting
+							}"
+							required
+							placeholder="e.g. Season 1"
+							@input="resetNameErr(); nameIsEmpty = $el.value.trim() === ''; if(nameIsEmpty) { nameError='Season name is required'; nameIsUnique=false; } updateCanSubmit();"
+							hx-post="/htmx/isseasonnameunique"
+							hx-trigger="input changed delay:500ms"
+							hx-swap="none"
+							@htmx:before-request="if($el.value.trim() === '') { nameIsEmpty=true; return; } nameIsEmpty=false; nameIsChecking=true; nameIsUnique=false; nameError=''; updateCanSubmit();"
+							@htmx:after-request="nameIsChecking=false; if($event.detail.successful) { nameIsUnique=true; } else if($event.detail.xhr.status === 409) { nameError='This season name is already taken'; nameIsUnique=false; } updateCanSubmit();"
+						/>
+					</div>
+					<p
+						class="text-center text-xs text-red mt-2"
+						x-show="nameError && !isSubmitting"
+						x-cloak
+						x-text="nameError"
+					></p>
+				</div>
+				<!-- Short Name Field -->
+				<div class="col-span-1">
+					<label for="short_name" class="block text-sm font-medium mb-2 text-subtext0">Short Name</label>
+					<div class="relative">
+						<input
+							type="text"
+							id="short_name"
+							name="short_name"
+							maxlength="6"
+							x-bind:class="{
+								'py-3 px-4 block w-full rounded-lg text-sm bg-surface0 disabled:opacity-50 disabled:pointer-events-none border-2 outline-none uppercase text-text placeholder-subtext0': true,
+								'border-surface1 focus:border-blue': !shortNameIsUnique && !shortNameError,
+								'border-green focus:border-green': shortNameIsUnique && !shortNameIsChecking && !shortNameError,
+								'border-red focus:border-red': shortNameError && !shortNameIsChecking && !isSubmitting
+							}"
+							required
+							placeholder="e.g. S1"
+							pattern="[A-Z0-9]+"
+							@input="
+								let val = $el.value.toUpperCase().replace(/[^A-Z0-9]/g, '');
+								$el.value = val;
+								resetShortNameErr();
+								shortNameIsEmpty = val.trim() === '';
+								if(shortNameIsEmpty) {
+									shortNameError='Short name is required';
+									shortNameIsUnique=false;
+								}
+								updateCanSubmit();
+							"
+							hx-post="/htmx/isseasonshortnameunique"
+							hx-trigger="input changed delay:500ms"
+							hx-swap="none"
+							@htmx:before-request="if($el.value.trim() === '') { shortNameIsEmpty=true; return; } shortNameIsEmpty=false; shortNameIsChecking=true; shortNameIsUnique=false; shortNameError=''; updateCanSubmit();"
+							@htmx:after-request="shortNameIsChecking=false; if($event.detail.successful) { shortNameIsUnique=true; } else if($event.detail.xhr.status === 409) { shortNameError='This short name is already taken'; shortNameIsUnique=false; } updateCanSubmit();"
+						/>
+					</div>
+					<p
+						class="text-center text-xs text-red mt-2"
+						x-show="shortNameError && !isSubmitting"
+						x-cloak
+						x-text="shortNameError"
+					></p>
+				</div>
+			</div>
+			<p class="text-xs text-subtext0 -mt-3">Maximum 20 characters for name, 6 alphanumeric characters for short name</p>
+			<!-- Season Type and Start Date Fields (Inlined) -->
+			<div class="grid grid-cols-2 gap-4 items-end">
+				<!-- Season Type Field -->
+				<div>
+					<label for="type" class="block text-sm font-medium mb-2 text-subtext0">Season Type</label>
+					<select
+						id="type"
+						name="type"
+						class="py-3 px-4 block w-full rounded-lg text-sm bg-surface0 border-2 border-surface1 focus:border-blue outline-none text-text appearance-none cursor-pointer hover:bg-surface1 transition-colors"
+						required
+						style="height: 46px;"
+					>
+						<option value="regular" selected>Regular</option>
+						<option value="draft">Draft</option>
+					</select>
+				</div>
+				<!-- Start Date Field (Flatpickr) -->
+				<div>
+					<label for="start_date" class="block text-sm font-medium mb-2 text-subtext0">Start Date</label>
+					<input
+						type="text"
+						id="start_date"
+						name="start_date"
+						class="py-3 px-4 block w-full rounded-lg text-sm bg-surface0 border-2 border-surface1 focus:border-blue outline-none text-text placeholder-subtext0"
+						placeholder="DD/MM/YYYY"
+						required
+						style="height: 46px;"
+						@input="dateIsEmpty = $el.value.trim() === ''; resetDateErr(); if(dateIsEmpty) { dateError='Start date is required'; } updateCanSubmit();"
+					/>
+				</div>
+			</div>
+			<p
+				class="text-center text-xs text-red -mt-3"
+				x-show="dateError && !isSubmitting"
+				x-cloak
+				x-text="dateError"
+			></p>
+			<!-- Slap Version Field -->
+			<div>
+				<label for="slap_version" class="block text-sm font-medium mb-2 text-subtext0">Slap Version</label>
+				<select
+					id="slap_version"
+					name="slap_version"
+					class="py-3 px-4 block w-full rounded-lg text-sm bg-surface0 border-2 border-surface1 focus:border-blue outline-none text-text appearance-none cursor-pointer hover:bg-surface1 transition-colors"
+					required
+					style="height: 46px;"
+				>
+					<option value="rebound" selected>Rebound</option>
+					<option value="slapshot1">Slapshot 1</option>
+				</select>
+				<p class="text-xs text-subtext0 mt-1">Select the game game version for this season</p>
+			</div>
+			<!-- General Error Message -->
+			<p
+				class="text-center text-sm text-red"
+				x-show="generalError"
+				x-cloak
+				x-text="generalError"
+			></p>
+			<!-- Submit Button -->
+			<button
+				x-bind:disabled="!canSubmit || isSubmitting"
+				x-text="buttonText"
+				type="submit"
+				class="w-full py-3 px-4 inline-flex justify-center items-center 
+                    gap-x-2 rounded-lg border border-transparent transition-all duration-200 font-semibold
+                    bg-blue hover:bg-blue/80 text-mantle hover:cursor-pointer shadow-md
+                    disabled:opacity-50 disabled:cursor-not-allowed disabled:shadow-none hover:shadow-lg hover:-translate-y-0.5"
+			></button>
+		</div>
+	</form>
+}
diff --git a/internal/view/seasonsview/new_page.templ b/internal/view/seasonsview/new_page.templ
deleted file mode 100644
index 576c90d..0000000
--- a/internal/view/seasonsview/new_page.templ
+++ /dev/null
@@ -1,23 +0,0 @@
-package seasonsview
-
-import "git.haelnorr.com/h/oslstats/internal/view/baseview"
-
-templ NewPage() {
-	@baseview.Layout("New Season") {
-		<div class="max-w-screen-lg mx-auto px-4 py-8">
-			<div class="bg-mantle border border-surface1 rounded-xl">
-				<div class="p-6 sm:p-8">
-					<div class="text-center mb-8">
-						<h1 class="text-3xl font-bold text-text">Create New Season</h1>
-						<p class="mt-2 text-sm text-subtext0">
-							Add a new season to the system. All fields are required.
-						</p>
-					</div>
-					<div class="max-w-md mx-auto">
-						@NewForm()
-					</div>
-				</div>
-			</div>
-		</div>
-	}
-}
diff --git a/internal/view/seasonsview/new_season_modal.templ b/internal/view/seasonsview/new_season_modal.templ
new file mode 100644
index 0000000..7c82280
--- /dev/null
+++ b/internal/view/seasonsview/new_season_modal.templ
@@ -0,0 +1,65 @@
+package seasonsview
+
+// NewSeasonModal renders a modal containing the new season form
+// This is used on the seasons list page for a better UX
+templ NewSeasonModal() {
+	<div
+		x-data="{ open: false }"
+		x-show="open"
+		x-cloak
+		@open-new-season-modal.window="open = true"
+		@close-new-season-modal.window="open = false"
+		class="fixed inset-0 z-50 overflow-y-auto"
+		aria-labelledby="modal-title"
+		role="dialog"
+		aria-modal="true"
+	>
+		<!-- Background overlay -->
+		<div
+			x-show="open"
+			x-transition:enter="ease-out duration-300"
+			x-transition:enter-start="opacity-0"
+			x-transition:enter-end="opacity-100"
+			x-transition:leave="ease-in duration-200"
+			x-transition:leave-start="opacity-100"
+			x-transition:leave-end="opacity-0"
+			class="fixed inset-0 bg-base/75 transition-opacity"
+			@click="open = false"
+		></div>
+		<!-- Modal panel -->
+		<div class="flex min-h-full items-center justify-center p-4">
+			<div
+				x-show="open"
+				x-transition:enter="ease-out duration-300"
+				x-transition:enter-start="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
+				x-transition:enter-end="opacity-100 translate-y-0 sm:scale-100"
+				x-transition:leave="ease-in duration-200"
+				x-transition:leave-start="opacity-100 translate-y-0 sm:scale-100"
+				x-transition:leave-end="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
+				class="relative transform overflow-hidden rounded-xl bg-mantle border border-surface0 shadow-xl transition-all w-full max-w-lg"
+				@click.stop
+			>
+				<!-- Header -->
+				<div class="px-6 py-4 border-b border-surface0">
+					<div class="flex justify-between items-center">
+						<h3 class="text-xl font-bold text-text" id="modal-title">Create New Season</h3>
+						<button
+							type="button"
+							@click="open = false"
+							class="text-subtext0 hover:text-text transition-colors"
+						>
+							<svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+								<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12"></path>
+							</svg>
+						</button>
+					</div>
+					<p class="text-sm text-subtext0 mt-1">Add a new season to the system. All fields are required.</p>
+				</div>
+				<!-- Form content -->
+				<div class="p-6">
+					@NewFormModal()
+				</div>
+			</div>
+		</div>
+	</div>
+}
diff --git a/internal/view/seasonsview/season_league_layout.templ b/internal/view/seasonsview/season_league_layout.templ
index e550ead..7fb6b96 100644
--- a/internal/view/seasonsview/season_league_layout.templ
+++ b/internal/view/seasonsview/season_league_layout.templ
@@ -11,19 +11,17 @@ templ SeasonLeagueLayout(activeSection string, season *db.Season, league *db.Lea
 				<!-- Header Section -->
 				<div class="bg-surface0 border-b border-surface1 px-6 py-8">
 					<div class="flex flex-col sm:flex-row justify-between items-start sm:items-center gap-4 mb-4">
-						<div>
-							<h1 class="text-4xl font-bold text-text mb-2">{ season.Name } - { league.Name }</h1>
-							<div class="flex items-center gap-2 flex-wrap">
-								<span class="inline-block bg-surface1 px-3 py-1 rounded text-sm text-subtext0 font-mono">
-									{ season.ShortName }
-								</span>
-								<span class="inline-block bg-blue px-3 py-1 rounded-full text-sm font-semibold text-mantle">
-									{ league.ShortName }
-								</span>
-								@SlapVersionBadge(season.SlapVersion)
-								@StatusBadge(season, false, false)
-							</div>
+					<div>
+						<div class="flex items-center gap-3 mb-2">
+							<h1 class="text-4xl font-bold text-text">{ season.Name } - { league.Name }</h1>
+							<span class="text-lg font-mono text-subtext0 bg-surface1 px-2 py-0.5 rounded">{ season.ShortName }</span>
 						</div>
+						<div class="flex items-center gap-2 flex-wrap">
+							@SeasonTypeBadge(season.Type)
+							@SlapVersionBadge(season.SlapVersion)
+							@StatusBadge(season, false, false)
+						</div>
+					</div>
 						<div class="flex gap-2">
 							<a
 								href={ templ.SafeURL("/seasons/" + season.ShortName) }