Added fixes for display issues.