fixed some ui bugs