updated mixins and grid