fix avatar
merge css