As far as senators.........repeal the 17th amendment. Why? Because the senate was put in soley as a branch of government to represent the states interest in congress. Today, a senator can get elected, and go with the party platform; even if it goes against the elected state officials wishes. What this means is..................the people who elected their state officials for their stance on issues are NOT served. If a state as a whole has a MODERATE view and elects MODERATES to their state legislature, what kind of senator do you think they would appoint? And if they went crazy and moved to the outskirts, the state legislature would recall them and appoint someone else.
You have a driving force of whomever is in charge as the minority/majority whip telling senators if they want contributions to their re-election campaign, you tow the party line. This is exactly how you lose states rights, and make the senate dysfunctional! I can almost promise you, that if the state legislatures appointed their senators, Presidents of BOTH parties would have their vetoes over ridden on a much more consistent basis, and you would have many more bills plopped on his/her desk to consider.