Separate api calls routing from nav
Merge pull request #1 from john-gu/master

Separate api calls routing from nav