Added menu special-case handling