Refact view for demo