[Nav-users] some adjustments