[VP, TP] calculator_menu, calculator

further work on both classes
[VP, TP] SubMenu deleted
Merge remote-tracking branch 'origin/Paul'