fixed the Navigater