final UI changes