New grid

https://www.pivotaltracker.com/s/projects/927566/stories/62487746