Implemented UI changes