Improve select box