Added some bug fixes for grid gutter