Refactor CSS III. And fill void states.