Re-structure tab navigation based on our UI mockups
Merge pull request #217 from ryojiosawa/mobile/nav

Re-structure tab navigation based on our UI mockups
added map to tab