Added some changes to UI