Allow + in phone numbers
Restructured user interface