fix to grid typo and added mixins