UI minor corrections