fix navigation
cleaning up