Added Grid mixin and moved some things around