The "Modern" or new estimate experience doesn't have the same problem, and it has better tracking. However, it's not as customizable as the older template is.
