UI fix and a new select button