Refactor CSS and HTML for simplicity and clarity