UI design improve