diff --git a/src/client/GameModeSelector.ts b/src/client/GameModeSelector.ts
index a3693eccc..6cf39a873 100644
--- a/src/client/GameModeSelector.ts
+++ b/src/client/GameModeSelector.ts
@@ -153,30 +153,35 @@ export class GameModeSelector extends LitElement {
-
- ${ffa
+
+ ${special
? html`
- ${this.renderLobbyCard(ffa, this.getLobbyTitle(ffa))}
+ ${this.renderSpecialLobbyCard(special)}
`
- : nothing}
+ : ffa
+ ? html`
+ ${this.renderLobbyCard(ffa, this.getLobbyTitle(ffa))}
+
`
+ : nothing}
-
- ${teams || special
- ? html`
- ${teams
- ? html`
- ${this.renderLobbyCard(teams, this.getLobbyTitle(teams))}
-
`
- : nothing}
- ${special
- ? html`
- ${this.renderSpecialLobbyCard(special)}
-
`
- : nothing}
-
`
- : nothing}
+
+
+ ${special && ffa
+ ? html`
+ ${this.renderLobbyCard(ffa, this.getLobbyTitle(ffa))}
+
`
+ : nothing}
+ ${teams
+ ? html`
+ ${this.renderLobbyCard(teams, this.getLobbyTitle(teams))}
+
`
+ : nothing}
+
-
+
+
+ ${special ? this.renderSpecialLobbyCard(special) : nothing}
+
${ffa
? this.renderLobbyCard(ffa, this.getLobbyTitle(ffa))
@@ -187,9 +192,6 @@ export class GameModeSelector extends LitElement {
? this.renderLobbyCard(teams, this.getLobbyTitle(teams))
: nothing}
-
- ${special ? this.renderSpecialLobbyCard(special) : nothing}
-
diff --git a/src/server/MapPlaylist.ts b/src/server/MapPlaylist.ts
index 2cd9e0280..bb37e0d3c 100644
--- a/src/server/MapPlaylist.ts
+++ b/src/server/MapPlaylist.ts
@@ -109,14 +109,14 @@ type ModifierKey =
// Each entry represents one "ticket" in the pool. More tickets = higher chance of selection.
const SPECIAL_MODIFIER_POOL: ModifierKey[] = [
- ...Array