Added some changes on the UI