Actually fix navbar and navlist.