added navbar, used more bootstrap