[VP, TP] refactored menu v2

refactored menu again, removed return on enter and clear