WIP updating selects to handle small sizes