Fix edit form avatar and things