Fixed margin issue for grid