fix some ui issues