UI-784: Changed carrier selection to buttons instead of lame dropdown