fixed the style and js issue