Improvement of UI