Furiously re-factoring the UI a bit after some testing.