Revert "Revert "Restructure & add demo view""

This reverts commit 507f7fe2cb207d975a75b9e2f931afedefe32395.