Updated validations and included validate js