Rolled back sidebar changes regarding avatar. Pending changes at the bottom.