Fixed UI issues.