cleaned up some navigation