More tests and CSS adjustments