nav code clean up