fix grid collapse if nested

Signed-off-by: Bravocado <bravocado.project@gmail.com>
Merge branch 'refs/heads/general/mixins'