BZ-9998: markup for estimator, footer changes