Unified CSS layout

black & white solidified with no switch statement