Refact view for demo

:poop: