Additional Validation and bug fixes

We need patients to work with Jscript and CSS :(