Fix unit and scope activation: separate navigation, activation of units and activation scopes so that the branch strategy can be executed for any unit