Fixes for avatar improvements and other UI elements