Fixed some complaints I was getting about the HTML hierarchy