multiple issues fixed related to Billing screens