Update demo to use new grid syntax