Fixed HTML to reflect recent class conventions