Restore column layout for most treeviews
(cherry picked from commit 593472cce8da70cabec897918c60914c36289d5e)