Fix forecast calculation and presentation