Took care of the UI, still not into the form scope
Finished form
New fixes to form
Merge branch 'Adding-selector' into develop/mvc