fix navigation finally