CSS and minor changes