CSS & JS fixes