Added investment income to the tax calculator