added navbar, other stuff