Cleaned up some of the HTML to make it simpler and to get down to what we want to do.