Navigation - Changes

changes regarding navigation