fix user avatar layout bug
merge