menu tweaks, fixes