changed layout and fixed select2 alignment