It sounds like she's a titch herd bound. My guy does the same thing sometimes if he hasn't been ridden for a while (he only has one stablemate, and they get attached pretty easily with just 2 horses, in my personal experience), and let me tell you that fidgety and calling out is the worst that you ever want that "little vice" to get.
What helps mine when they start doing that stuff is to put them to work a little. If she whinnies or fusses, put her up on a good forward trot and do some serpentines or loops; whatever you can do in the space that you have to get her feet moving and changing direction. When she feels more relaxed, has her ears in an "I'm listening to you, not my buddy" position, maybe licking and chewing with her head a bit lower, allow her to walk on and praise her. When she's behaving, continue on your ride. Usually one or two whinny-triggered workouts gets them to realize that they have to work harder if they don't pay attention to me.
I also like the method of working the herd bound horse where they want to be, and resting were I want them to be. Give her something to think about (trot work, loops, rollbacks along the fence if your horse knows that and your fence is safe to ride pretty close to; just get her heart pumping a bit) near her herd-mates, and when she offers you some signs of relaxation and/or is being really quiet and responsive, trot away and rest/praise farther away from the herd. After she's got her wind back, walk
back to the herd and work again, trotting away to rest. This can be done as ground work or ridden. THIS WORKS BETTER FOR MORE INGRAINED HABITS. IMO, it doesn't sound like she's giving you too much trouble, just being a nuisance (please correct me if I'm wrong on that assumption).
Of course, if she starts really acting on her preference to stay with the herd (i.e. Bolting back to the herd, balking when asked to go leave, etc), a good trainer on-site may be a good idea for the sake of safety.
Good luck, and ride safely!