fix navigation bug. extracted to partial