Added some changes to the UI