refinements and updates to the calculate page