remove nil value estimates show page
Merge branch 'master' into vaibhav