Added some ui changes
Fixed some UI issues