Edit profile

Added avatar to other photo locations, cleaned up edit form