[VP, TP] SubMenu refactored