CSS and JS cleanups