Make menu items more consistent (trees vs non-trees, etc)