BZ-12426: Fix issues on savings preview and on edit finance estimates