- added js validation
- added some fix