Add avatar component and make some adjust at previously components