[CLEANUP] Rework CSS