UI last cleanup