Fixed app navigation

Fixed problems caused while navigating and rebuilding the app