More progress

Map selections work properly
Check new Cards settings when mote deleted