UHM-169 - simplifying CSS a bit