made some changes with UI