Refactor CSS class names and simplify markup