update layouts to work with new grid syntax
Merge pull request #224 from tilomitra/master

Update layouts to work with new grid syntax