used border mixin
renamed grid classes