More grid fixes and updates, focused on grid-custom example