Catalyst-Web estimate UI fix

Change-Id: Ic58744ab805433fd58aa086d675b5fc1aad21d1b
Merge topic 'catalyst-web-estimate' into master

0607cc53 Catalyst-Web estimate UI fix