Finalizing menu tweaks