minor menu cleanups