improved on UI