Refactor part 1: split CSS