Cleans up markup before we have too many pages
Merge branch 'master' into ui_cleanup
Merge pull request #3 from andypike/ui_cleanup

Cleans up markup