Css & JS fixes