Fix some layout issues.