Clean up HTML and CSS structure