Improved CSS markup and browser support