Fixed up grid to use mixin and such Issue #1