Refactor avatar to be part of root link