Global fix CSS and extend ruleset #2