Improve the UI a bit