Setup initial HTML structure
Merge branch 'dev' into Richard