fix navigation, part next