Removed ridiculous dependency on MenuItem structure