Added another demo page.
Separated some code between pages.
Merge branch 'feature/modular' into develop