Update grid utility functions and mixins
Dist add
Fix syntax error and merge conflicts in dist