Issue #2284545 by Dano Manion: use nup mixin for grids.
Issue #2284545 by Dano Manion: dont forget to add todo.