GUI-348: Misc CSS fixes, take two