css + html refactoring