Added submenu column grouping for more logical list order