edit avatar fixes (not completed yet)