First pages commit
Small changes to load in the right order
Merge commit