Tweaked style and separated js