added some ui fix