CSS and JS bugfixes