UI minor fixes