User avatar fix & caret added