replace nested param with gutter removal option

clean up base mixin
merge container with row width + margins