Fix grid display for hierarchical tables. Closes #13
Merge ../swing