Fixed some selection box bugs