CSS Bug fixes