CSS and BS updates