TASK Cleanup and improve column rendering