Issue 4298 - Billing gui changes