[VP, TP] menu screens refactored

refactored but not yet finished