Fix javascript
more js fixes