Fix some more layout issues.