remove avatar image; add test for avatar setting being defined and display image if true