Improve ui 2