Fixed several display issues.