Revise CSS and restructure HTML