Some work with nav bar, test suite passing again