Added some ui improvements