fixed a couple issues where user avatar was not reference correctly