Enhancements to Avatar preview