Use AvatarButton in UserInfo instead of a custom button

Use AvatarButton in UserInfo instead of a custom button. This has the advantage of showing keyboard focus properly