cleanup nav code