I think the Constitution should be amended to allow a national vote on wether or not current elected officials would be allowed to run for office again. Kind of an instant term limit.
Say if 10% or ... of the voting population signed a petition it would invoke this special vote.
If the vote passes then everyone in the House of Reps, the Senate and the White House hit an instant limit to their term and will not be allowed to run for that office again.