CSS and other improvements