Simplify default view
Update default view
Update demo. Small corrections.