fixed remnants from vcs merge
added a nav bar