changed some ui code