UI polishing work in progress.