Refactored html structure
Merge branch 'refactor-html-structure'