Moved around stuff in avatar.js