Working on innerNavigation, restructure code!