Fixes for choice trier, which got upset by AddTabs(), also added the trier logic to the grid module