Added GridItemsControl and test