[VP, TP] Menu structure refactored