Some CSS changes - trying to simplify the code (sorta)