Cleanup navbar while still passing all tests