Revert "refactor navigation controller"

This reverts commit 41ab846aac43a459c18b9a017068731c22affcf5.