fix navigation
merge and fix navigation