Made some changes to UI