updated grid
updated mixins