Better nav solution is here