Improved text and avatar