Moved some selects around