Fixed more of my bad HTML