Minor menu tweaks