update improve-css branch

bring the improve-css branch up-to-date with the Master branch, so we can start working on the CSS again.