Moving around selects to improve flow