UI minor improvement