Comment 12 for bug 1615781

I've updated the branch. The additions were getting a little out of hand, so I've rebased it. There are four relevant commits. Festivus is up to date.

I'm not totally happy with the solution for the grid settings dropdown on empty tables, but let me know what you think!