Improve the ui