Use phonenumber field and improve forms