Refactored HTML and CSS Classes