Added avatar choice and fixed notification error