Fixed max units, removed initial "select" option