Added Analytics, progress, fixed Navbar