Fix a lot of UI problems.  Winning!