Centralize card weight handling
Fix initial card selection