CSS fixes and other improvements