selectbox improvement

Shouldn't then all be changed accordingly?