Improvement of the UI