fixing up no gutter mixin, structure changes