Minor changes to make html structure clearer.