Updated demo with GridLayout