Avatar fix and style changes mostly