Refined views for demo v1.0