Cleaning up some stuff and updating the navigation