some ui improvement