VENCalculatorInputView - Structural changes, tweaks and make file changes