Bug fix and Billing page