Refactoring for new demo pages
Working on touch issue