Fixed some code for in-app navigation