Fix navigation scenario, excluding the home
Update edit user scenario