commit - staggeredGrid refactoring