Menu: more fixes & cleanup