Costmetic improvements to the contract tool.