Added some ui changes