Fix CSS validity error
Refactor things