CSS changes and optimizations