Improve the UI