Issue #21628: Added base amounts and calculations to views