Temporary CSS and JS fix