More changes

* Reinforced JS Checks on forms
* Fixed bugs in code