Js and Styles cleanup