WIP: more menu tinkering