Finish UI changes