Touching up the HTML to look better