Refact view for demo

see above