Adjust columns.
Improved support for Membership plugin.