Finish UI polishing