CSS and JS fixes