fixed avatar and refs hover
merge conflict