diff --git a/backend/bang/expansions/dodge_city/cards.py b/backend/bang/expansions/dodge_city/cards.py
index a431a58..981a48d 100644
--- a/backend/bang/expansions/dodge_city/cards.py
+++ b/backend/bang/expansions/dodge_city/cards.py
@@ -341,7 +341,6 @@ class FucileDaCaccia(Card):
 
 def get_starting_deck() -> List[Card]:
     return [
-        #TODO: aggiungere anche le carte normalmente presenti https://bang.dvgiochi.com/cardslist.php?id=3
         Barile(Suit.CLUBS, 'A'),
         Binocolo(Suit.DIAMONDS, 10),
         Dinamite(Suit.CLUBS, 10),
diff --git a/frontend/src/components/Lobby.vue b/frontend/src/components/Lobby.vue
index 567acbb..3633532 100644
--- a/frontend/src/components/Lobby.vue
+++ b/frontend/src/components/Lobby.vue
@@ -34,8 +34,8 @@
 			</div>
 			<div v-if="!started">
 				<h3>{{$t("expansions")}}</h3>
-				<div v-for="ex in togglable_expansions" v-bind:key="ex">
-					<PrettyCheck @click.native="toggleExpansions(ex)" :disabled="!isRoomOwner" :value="is_toggled_expansion(ex)" class="p-switch p-fill" style="margin-top:5px; margin-bottom:3px;">{{get_expansion_name(ex)}}</PrettyCheck>
+				<div v-for="ex in expansionsStatus" v-bind:key="ex.id">
+					<PrettyCheck @click.native="toggleExpansions(ex.id)" :disabled="!isRoomOwner" :checked="ex.enabled" class="p-switch p-fill" style="margin-top:5px; margin-bottom:3px;">{{ex.name}}</PrettyCheck>
 					<br>
 				</div>
 				<h3>{{$t('mods')}}</h3>
@@ -139,6 +139,15 @@ export default {
 		inviteLink() {
 			return `${window.location.origin}/game?code=${this.lobbyName}&pwd=${this.password}`
 		},
+		expansionsStatus() { 
+			return this.togglable_expansions.map(x=>{
+				return {
+					id: x,
+					name: x.replace(/(^|_)([a-z])/g, function($0,$1,$2) {return ' ' + $2.toUpperCase()}),
+					enabled: this.expansions.indexOf(x) !== -1
+				}
+			})
+		},
 		storedUsername() {
 			if (localStorage.getItem('username'))
 				return localStorage.getItem('username')
@@ -174,11 +183,9 @@ export default {
 	},
 	methods: {
 		is_toggled_expansion(ex) {
+			console.log(ex+' '+ this.expansions+ (this.expansions.indexOf(ex) !== -1))
 			return this.expansions.indexOf(ex) !== -1
 		},
-		get_expansion_name(ex) {
-			return ex.replace('_', ' ').replace(/\w\S*/g, m => m.charAt(0).toUpperCase()+m.substr(1).toLowerCase())
-		},
 		leaveRoom() {
 			window.location.replace(window.location.origin)
 		},