Improve the css to make it more bulletproof