Added column chooser, and preserve sort order and width.