Features for checkout with multiple payment options and some other updation in steps and features