More tweaks to menu to avoid transparency bug.