added mixins and finish grid