Adding select2
better handling of form binding