Working on innerNavigation, restructure code!
Merge remote-tracking branch 'origin/master'