Various tweaks

and a start on the card selection menu.