Added nav bar functionality
Fixed merge conflict