Deleted Views and changed Addresses to Billing and Shipping