Fixed the navbar and added some new features