removed scoping
edited layout of form
Merge conflicts fixed