Cleaning up navbars and navlists