some ui improvements