CSS styling, HTML reorganization