Refact view for demo

WTF? please **respect** the indentation!