minor menu rearrangement