More CSS separation #2785