Improvments of UI