Fix several display issues.