BZ-9998: markup for estimator
BZ-10185: improving overview layout