CSS and markup refactoring