select2 fixed

and some improvements to the layout