CSS and html refactoring