Comment 2 for bug 1355901

With the attached branch I was able to get all the expected combinations to work.

There's one caveat though: first row is the king. That's what decides on column widths for the whole set of attributes.

To achieve a 1 per line effect, you need to remember that you need to also send the trailing empty attributes, otherwise it'll lay out 3 in a row.