added contain-to-grid styles back in, fixes #1628