Added more consistent in-app navigation