** Fixed navigation should work now properly