Cleanup of nav bar to pass all tests