made some changes on UI