fix grid
Merge branch 'feature/refactoring_#25' into staging