Plug in very rough grid-ish thing.

Steals everything from the work @breethomas has been doing on the
redesign, except that I don't know enough to fix the things that I
broke.