Improved markup of select elements in form