Initialy, Umaga was supposed to be moved to Smackdown right after Wrestlemania to continue the feud with Batista. But as we all know, that didnt happened. Now the plans are that Umaga get switched to SD and feud with the Undertaker, witch would be an interesting feud.
As far as Vince being unhappy of how the Piper/Marella segment came off last week, well all i have to say is that if he thinks he can do better then he should produce the angles himself. Otherwise i would advise him to keep his mouth shut as he is the one who gave the approval to air the segment after all.