Add avatar placeholder and fix bug