Adding future value functions and new layout