Migrated demo to new layout