Created a demo page
Merged app and app_dev with stack