Fixed up the UI a lot.