Play with Gridset support and fix layout bugs