CSS overhaul