Styles and js improvement