Improve the UI a fair bit.