CSS, some refactor