Added username and avatar. Cleaned up NavBar.