CSS updates

Bugfixes from previous commits