Cleanup nav
more cleaup