Added some polishing, modified Navbar, etc.