Non ajax version of pages
Optimised build
Merge branch 'v2'