Refactored javascript
Fixed merge conflict