restructure nav_click functions