Improve the UI design