Avatar change and a few style fixes