nav-switch modification