refactoring

[7528143]
Merge branch 'task/7528143-CalculationScreen_new_design' of github.com:shakemilk/MoneyPlan into task/7528143-CalculationScreen_new_design