Fix column classnames to prevent foundation interference, improve margins