More menu tweaks