CSS and rendering fixes