Changed future value calculations and UI fixes