Add some ui improvements