add avatar setting and unit setting