Refactoring CSS and html significantly