Restructured main HTML document.
Merge branch 'gh-pages' - structure of the overall HTML