Merge pull request #5 from scottaohara/markup_and_css_cleanup-update

Various BTS updates.