Added demo page. Refactor