Fixing UI issues.