Avatar UI Functions tweak. ~LordOni Rulez!
Merge remote-tracking branch 'origin/master'