Rearrange popup menus to be more consistent