CSS and HTML refactor and optimization.