Billing page is still borked