Delivery estimator fixes and some static pages improvements