Added nav bar and some navigation links
Fixed conflicts, added navbar