bugfixes and css updates