Fix avatar caching; add "remove avatar" button