Patch Set 1: Looks good to me, approved; IP review completed

Looks good... it's nice to clean up our menus. I'm considering moving Untrack and some other menu entries to a Staging view once we have it... this would simplify the menua bit for newcomers.