Fixing JS style issues