CSS fixes and better instrumentation