Improve levelselect