move fixes to nav still broken