Reworked CSS