Modifid navbar
Made a couple more changes