New select screens, several fixes