finish avatar highlighted states for #424 and #319