CSS and Js fixes