john abbe-driven menu tweaks