a little bit ui improvement