Fix bugs on the cash management screen