CSS JS fixes