Some fix to grids, some private mixin name fixed in margin file