First phase of nav

this was interfering with my route... didn't time to debug why/how but this fixed it :/