Fixes various regressions.

Fixes missing close button and blanks on column headers introduced by commit 81ab7ae82adcda610950bf04dbdd31bf516bad81.

Fixes assertion errors introduced by commit aca0bde10a4285f20627fdb351c91e04128acb54.

Rename ambiguously named columns.