Re-add navigator specs, updated to handle async entry loading.