Big refactor of page structure.
Merge branch 'structure' into dev