Menu: small fixes & cleanup