field_avatar changed to user_picture with modal upload form

All references to the old field_avatar have been changed to user_picture as well, along with a minor bug fix