Made changes on estimation templates