Fixed the Navigation