Move avatar to a component