Redesign card_info and payment info