Practice fixes
Merge remote-tracking branch 'origin'
Fixed collectionview/stackedgridlayout