Updated grid mixin and other small updates.