CSS improvements and bugfixes