fix some layout issues.