Added avatar upload
Updated badges functions