Refactoring to simplify how table columns are managed in the UI