Adding support for accounting fees and penalties separately on the UI