added a nav bar
merge