Added CalculateBtn and also cleaned up field Variables