Update to JS files and styles
Fixed merge conflict